From e6e370a7fe930e04cec38bcc2e06be127ed7ee02 Mon Sep 17 00:00:00 2001 From: Jeff Roberson Date: Sun, 4 Aug 2002 10:29:36 +0000 Subject: - 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 --- sys/gnu/ext2fs/ext2_vnops.c | 9 ++++++--- sys/gnu/fs/ext2fs/ext2_vnops.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 846e3adbdef7..4474c23d1744 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -718,10 +718,13 @@ loop: goto loop; } if (ap->a_waitfor == MNT_WAIT) { + VI_LOCK(vp); while (vp->v_numoutput) { - vp->v_flag |= VBWAIT; - tsleep(&vp->v_numoutput, PRIBIO + 1, "e2fsyn", 0); + vp->v_iflag |= VI_BWAIT; + msleep(&vp->v_numoutput, VI_MTX(vp), + PRIBIO + 1, "e2fsyn", 0); } + VI_UNLOCK(vp); #if DIAGNOSTIC if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) { vprint("ext2_fsync: dirty", vp); @@ -1861,7 +1864,7 @@ ext2_vinit(mntp, specops, fifoops, vpp) } if (ip->i_number == ROOTINO) - vp->v_flag |= VROOT; + vp->v_vflag |= VV_ROOT; /* * Initialize modrev times */ diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index 846e3adbdef7..4474c23d1744 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -718,10 +718,13 @@ loop: goto loop; } if (ap->a_waitfor == MNT_WAIT) { + VI_LOCK(vp); while (vp->v_numoutput) { - vp->v_flag |= VBWAIT; - tsleep(&vp->v_numoutput, PRIBIO + 1, "e2fsyn", 0); + vp->v_iflag |= VI_BWAIT; + msleep(&vp->v_numoutput, VI_MTX(vp), + PRIBIO + 1, "e2fsyn", 0); } + VI_UNLOCK(vp); #if DIAGNOSTIC if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) { vprint("ext2_fsync: dirty", vp); @@ -1861,7 +1864,7 @@ ext2_vinit(mntp, specops, fifoops, vpp) } if (ip->i_number == ROOTINO) - vp->v_flag |= VROOT; + vp->v_vflag |= VV_ROOT; /* * Initialize modrev times */ -- cgit v1.3