91e7e1709..94a67fdef428 100644
--- a/sys/fs/p9fs/p9fs_vfsops.c
+++ b/sys/fs/p9fs/p9fs_vfsops.c
@@ -284,7 +284,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags,
 			node = vp->v_data;
 			/* Remove stale vnode from hash list */
 			vfs_hash_remove(vp);
-			node->flags |= P9FS_NODE_DELETED;
+			P9FS_NODE_SETF(node, P9FS_NODE_DELETED);
 
 			vput(vp);
 			*vpp = NULLVP;
@@ -372,7 +372,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags,
 	if (*vpp == NULL) {
 		P9FS_LOCK(vses);
 		STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next);
-		np->flags |= P9FS_NODE_IN_SESSION;
+		P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION);
 		P9FS_UNLOCK(vses);
 		vn_set_state(vp, VSTATE_CONSTRUCTED);
 		*vpp = vp;
@@ -448,7 +448,7 @@ p9_mount(struct mount *mp)
 	P9FS_VOFID_LOCK_INIT(p9fs_root);
 	STAILQ_INIT(&p9fs_root->vofid_list);
 	p9fs_root->parent = p9fs_root;
-	p9fs_root->flags |= P9FS_ROOT;
+	P9FS_NODE_SETF(p9fs_root, P9FS_NODE_ROOT);
 	p9fs_root->p9fs_ses = vses;
 	vfs_getnewfsid(mp);
 	strlcpy(mp->mnt_stat.f_mntfromname, from,
diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c
index 81cc0e3439e6..0ac86343649f 100644
--- a/sys/fs/p9fs/p9fs_vnops.c
+++ b/sys/fs/p9fs/p9fs_vnops.c
@@ -111,7 +111,7 @@ p9fs_cleanup(struct p9fs_node *np)
 
 	P9FS_LOCK(vses);
 	if ((np->flags & P9FS_NODE_IN_SESSION) != 0) {
-		np->flags &= ~P9FS_NODE_IN_SESSION;
+		P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION);
 		STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next);
 	} else {
 		P9FS_UNLOCK(vses);
@@ -675,7 +675,7 @@ p9fs_open(struct vop_open_args *ap)
 		error = vinvalbuf(vp, 0, 0, 0);
 		if (error != 0)
 			return (error);
-		np->flags &= ~P9FS_NODE_MODIFIED;
+		P9FS_NODE_CLRF(np, P9FS_NODE_MODIFIED);
 	}
 
 	vfid = p9fs_get_fid(vses->clnt, np, ap->a_cred, VFID, -1, &error);
@@ -1003,7 +1003,7 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp)
 
 	/* Setting a flag if file changes based on qid version */
 	if (np->vqid.qid_version != stat->qid.version)
-		np->flags |= P9FS_NODE_MODIFIED;
+		P9FS_NODE_SETF(np, P9FS_NODE_MODIFIED);
 	memcpy(&np->vqid, &stat->qid, sizeof(stat->qid));
 	if (!excl_locked)
 		VI_UNLOCK(vp);
@@ -1549,7 +1549,7 @@ remove_common(struct p9fs_node *dnp, struct p9fs_node *np, const char *name,
 	cache_purge(vp);
 	vfs_hash_remove(vp);
 
-	np->flags |= P9FS_NODE_DELETED;
+	P9FS_NODE_SETF(np, P9FS_NODE_DELETED);
 
 	return (error);
 }