upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nullfs breakage caused by incomplete migration of v_interlock from

Browse source 
simple_lock to mutex.

Reset LK_INTERLOCK flag when interlock released manually.
This commit is contained in:
Boris Popov 2000-10-15 06:25:42 +00:00
parent 181d2a1564
commit d45a191e99
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/fs/nullfs/null_vnops.c
View file

@ -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;

8
sys/miscfs/nullfs/null_vnops.c
View file

@ -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;