diff options
| author | jeff <jeff@FreeBSD.org> | 2002-08-04 10:29:36 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2002-08-04 10:29:36 +0000 |
| commit | 02517b6731ab2da44ce9b49260429744cf0114d5 (patch) | |
| tree | e889f56910bf98cbee3be239655a9e4bbb928b2e /sys/gnu | |
| parent | a03ca02ee99a255a2c14a75ff8eb488960b13ea7 (diff) | |
| download | FreeBSD-src-02517b6731ab2da44ce9b49260429744cf0114d5.zip FreeBSD-src-02517b6731ab2da44ce9b49260429744cf0114d5.tar.gz | |
- 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
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vnops.c | 9 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vnops.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 846e3ad..4474c23 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 846e3ad..4474c23 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 */ |
