From f00f5d71c28ce561f6d88e8be78e39bc1e3503fc Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Thu, 28 Oct 2004 08:22:11 +0000 Subject: Reduce the locking activity by epsilon by checking VNON condition before releasing the mountlock. --- sys/gnu/ext2fs/ext2_vfsops.c | 7 +++---- sys/gnu/fs/ext2fs/ext2_vfsops.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 292f20e09d34..f8ba411c9195 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -922,17 +922,16 @@ ext2_sync(mp, waitfor, cred, td) loop: MNT_VNODE_FOREACH(vp, mp, nvp) { VI_LOCK(vp); - if (vp->v_iflag & VI_XLOCK) { + if (vp->v_type == VNON || (vp->v_iflag & VI_XLOCK)) { VI_UNLOCK(vp); continue; } MNT_IUNLOCK(mp); ip = VTOI(vp); - if (vp->v_type == VNON || - ((ip->i_flag & + if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && (vp->v_bufobj.bo_dirty.bv_cnt == 0 || - waitfor == MNT_LAZY))) { + waitfor == MNT_LAZY)) { VI_UNLOCK(vp); MNT_ILOCK(mp); continue; diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 292f20e09d34..f8ba411c9195 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -922,17 +922,16 @@ ext2_sync(mp, waitfor, cred, td) loop: MNT_VNODE_FOREACH(vp, mp, nvp) { VI_LOCK(vp); - if (vp->v_iflag & VI_XLOCK) { + if (vp->v_type == VNON || (vp->v_iflag & VI_XLOCK)) { VI_UNLOCK(vp); continue; } MNT_IUNLOCK(mp); ip = VTOI(vp); - if (vp->v_type == VNON || - ((ip->i_flag & + if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && (vp->v_bufobj.bo_dirty.bv_cnt == 0 || - waitfor == MNT_LAZY))) { + waitfor == MNT_LAZY)) { VI_UNLOCK(vp); MNT_ILOCK(mp); continue; -- cgit v1.3