summaryrefslogtreecommitdiff
path: root/sys/miscfs
diff options
context:
space:
mode:
authorBoris Popov <bp@FreeBSD.org>2000-10-15 06:25:42 +0000
committerBoris Popov <bp@FreeBSD.org>2000-10-15 06:25:42 +0000
commitd45a191e99a9512ff73ef2145d1f9160defc0531 (patch)
treec399c653258a6f253e7b4df257fef7e3a2736176 /sys/miscfs
parent181d2a15648ea96ff4278f2b4cc4fbebd796f61e (diff)
Notes
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/nullfs/null_vnops.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 9c15f9d7812c..7ce4bd2d15ce 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -625,7 +625,7 @@ null_lock(ap)
if (lvp == NULL)
return (lockmgr(&vp->v_lock, flags, &vp->v_interlock, p));
if (flags & LK_INTERLOCK) {
- simple_unlock(&vp->v_interlock);
+ mtx_exit(&vp->v_interlock, MTX_DEF);
flags &= ~LK_INTERLOCK;
}
if ((flags & LK_TYPE_MASK) == LK_DRAIN) {
@@ -671,8 +671,10 @@ null_unlock(ap)
if (lvp == NULL)
return (lockmgr(&vp->v_lock, flags | LK_RELEASE, &vp->v_interlock, p));
if ((flags & LK_THISLAYER) == 0) {
- if (flags & LK_INTERLOCK)
- simple_unlock(&vp->v_interlock);
+ if (flags & LK_INTERLOCK) {
+ mtx_exit(&vp->v_interlock, MTX_DEF);
+ flags &= ~LK_INTERLOCK;
+ }
VOP_UNLOCK(lvp, flags & ~LK_INTERLOCK, p);
} else
flags &= ~LK_THISLAYER;