- Replace v_flag with v_iflag and v_vflag

 - v_vflag is protected by the vnode lock and is used when synchronization
   with VOP calls is needed.
 - v_iflag is protected by interlock and is used for dealing with vnode
   management issues.  These flags include X/O LOCK, FREE, DOOMED, etc.
 - All accesses to v_iflag and v_vflag have either been locked or marked with
   mp_fixme's.
 - Many ASSERT_VOP_LOCKED calls have been added where the locking was not
   clear.
 - Many functions in vfs_subr.c were restructured to provide for stronger
   locking.

Idea stolen from:	BSD/OS

2 files changed, 4 insertions, 3 deletions

diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index a218bf0..ec41e30 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -187,8 +187,9 @@ nullfs_mount(mp, ndp, td)
 	 * Keep a held reference to the root vnode.
 	 * It is vrele'd in nullfs_unmount.
 	 */
+	mp_fixme("Unlocked vflag access");
 	nullm_rootvp = vp;
-	nullm_rootvp->v_flag |= VROOT;
+	nullm_rootvp->v_vflag |= VV_ROOT;
 	xmp->nullm_rootvp = nullm_rootvp;
 	if (NULLVPTOLOWERVP(nullm_rootvp)->v_mount->mnt_flag & MNT_LOCAL)
 		mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 2b141be..54bd884 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -794,7 +794,7 @@ null_createvobject(ap)
 	error = VOP_CREATEVOBJECT(lowervp, ap->a_cred, ap->a_td);
 	if (error)
 		return (error);
-	vp->v_flag |= VOBJBUF;
+	vp->v_vflag |= VV_OBJBUF;
 	return (0);
 }
 
@@ -809,7 +809,7 @@ null_destroyvobject(ap)
 {
 	struct vnode *vp = ap->a_vp;
 
-	vp->v_flag &= ~VOBJBUF;
+	vp->v_vflag &= ~VV_OBJBUF;
 	return (0);
 }