From ed87274d1667da183decdf76f6854a50f40a16ce Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 28 Jun 2001 22:21:33 +0000 Subject: Fix more mntvnode and vnode interlock order reversals. --- sys/gnu/ext2fs/ext2_vfsops.c | 4 ++-- sys/gnu/fs/ext2fs/ext2_vfsops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 9834131451f12..7263615876451 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -574,15 +574,15 @@ loop: goto loop; } nvp = LIST_NEXT(vp, v_mntvnodes); + mtx_unlock(&mntvnode_mtx); /* * Step 4: invalidate all inactive vnodes. */ - if (vrecycle(vp, &mntvnode_mtx, p)) + if (vrecycle(vp, NULL, p)) goto loop; /* * Step 5: invalidate all cached file data. */ - mtx_unlock(&mntvnode_mtx); mtx_lock(&vp->v_interlock); if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) { goto loop; diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 9834131451f12..7263615876451 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -574,15 +574,15 @@ loop: goto loop; } nvp = LIST_NEXT(vp, v_mntvnodes); + mtx_unlock(&mntvnode_mtx); /* * Step 4: invalidate all inactive vnodes. */ - if (vrecycle(vp, &mntvnode_mtx, p)) + if (vrecycle(vp, NULL, p)) goto loop; /* * Step 5: invalidate all cached file data. */ - mtx_unlock(&mntvnode_mtx); mtx_lock(&vp->v_interlock); if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) { goto loop; -- cgit v1.3