diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2008-02-08 21:45:47 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2008-02-08 21:45:47 +0000 |
| commit | 2433c4883eb2c0e38c25edc501612b569a01ab68 (patch) | |
| tree | d665c82ab8f9928d1e59b948e716949fff3645b5 /sys/kern | |
| parent | 5e9f6b73ee35b960ffb2d2900e88e3fa6114b5a3 (diff) | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_lock.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 877b40167691..d64b354f4e8f 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -606,7 +606,7 @@ lockstatus(lkp, td) int lock_type = 0; int interlocked; - KASSERT(td == NULL || td == curthread, + KASSERT(td == curthread, ("%s: thread passed argument (%p) is not valid", __func__, td)); if (!kdb_active) { @@ -615,7 +615,7 @@ lockstatus(lkp, td) } else interlocked = 0; if (lkp->lk_exclusivecount != 0) { - if (td == NULL || lkp->lk_lockholder == td) + if (lkp->lk_lockholder == td) lock_type = LK_EXCLUSIVE; else lock_type = LK_EXCLOTHER; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 80959740cc0d..d44510bcb05e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1638,7 +1638,7 @@ restart: VFS_UNLOCK_GIANT(vfslocked); vfslocked = 0; } - if (VOP_ISLOCKED(vp, NULL) != 0) { + if (VOP_ISLOCKED(vp, curthread) != 0) { VFS_UNLOCK_GIANT(vfslocked); return (1); } @@ -2208,7 +2208,7 @@ vput(struct vnode *vp) */ v_decr_useonly(vp); vp->v_iflag |= VI_OWEINACT; - if (VOP_ISLOCKED(vp, NULL) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(vp, curthread) != LK_EXCLUSIVE) { error = VOP_LOCK(vp, LK_UPGRADE|LK_INTERLOCK|LK_NOWAIT); VI_LOCK(vp); if (error) { @@ -2684,7 +2684,8 @@ DB_SHOW_COMMAND(lockedvnods, lockedvnodes) for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { nmp = TAILQ_NEXT(mp, mnt_list); TAILQ_FOREACH(vp, &mp->mnt_nvnodelist, v_nmntvnodes) { - if (vp->v_type != VMARKER && VOP_ISLOCKED(vp, NULL)) + if (vp->v_type != VMARKER && + VOP_ISLOCKED(vp, curthread)) vprint("", vp); } nmp = TAILQ_NEXT(mp, mnt_list); @@ -2971,7 +2972,7 @@ vfs_msync(struct mount *mp, int flags) MNT_VNODE_FOREACH(vp, mp, mvp) { VI_LOCK(vp); if ((vp->v_iflag & VI_OBJDIRTY) && - (flags == MNT_WAIT || VOP_ISLOCKED(vp, NULL) == 0)) { + (flags == MNT_WAIT || VOP_ISLOCKED(vp, curthread) == 0)) { MNT_IUNLOCK(mp); if (!vget(vp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK, @@ -3478,7 +3479,7 @@ void assert_vop_locked(struct vnode *vp, const char *str) { - if (vp && !IGNORE_LOCK(vp) && VOP_ISLOCKED(vp, NULL) == 0) + if (vp && !IGNORE_LOCK(vp) && VOP_ISLOCKED(vp, curthread) == 0) vfs_badlock("is not locked but should be", str, vp); } |