diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-08-16 17:18:54 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-08-16 17:18:54 +0000 |
| commit | a92a971bbb94ad5b44e2a5bbdc669ad3ae762c8d (patch) | |
| tree | 2b25fe1e41aaf0791b26dd5a4b8ad0cad897fe6e /sys/kern | |
| parent | d59f3890c36601f4f62bb4a0b7db977e42339588 (diff) | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_mqueue.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_default.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 018630ca7dad3..28fc1d84329b9 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -754,7 +754,7 @@ mqfs_allocv(struct mount *mp, struct vnode **vpp, struct mqfs_node *pn) found: *vpp = vd->mv_vnode; sx_xunlock(&mqfs->mi_lock); - error = vget(*vpp, LK_RETRY | LK_EXCLUSIVE, curthread); + error = vget(*vpp, LK_RETRY | LK_EXCLUSIVE); vdrop(*vpp); return (error); } diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 57465506d7d8b..c8e2947b613cb 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1348,7 +1348,7 @@ loop: VI_UNLOCK(vp); continue; } - if ((error = vget(vp, lockreq, td)) != 0) { + if ((error = vget(vp, lockreq)) != 0) { if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 03bfa129b16c3..a8a26e28a0acb 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2856,12 +2856,10 @@ vget_abort(struct vnode *vp, enum vgetstate vs) } int -vget(struct vnode *vp, int flags, struct thread *td) +vget(struct vnode *vp, int flags) { enum vgetstate vs; - MPASS(td == curthread); - vs = vget_prep(vp); return (vget_finish(vp, flags, vs)); } @@ -4684,7 +4682,7 @@ vfs_periodic_msync_inactive(struct mount *mp, int flags) VI_UNLOCK(vp); continue; } - if (vget(vp, lkflags, td) == 0) { + if (vget(vp, lkflags) == 0) { obj = vp->v_object; if (obj != NULL && (vp->v_vflag & VV_NOSYNC) == 0) { VM_OBJECT_WLOCK(obj); |