diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
| commit | cb05b60a8982e5497cd30449710deb2f4be653d4 (patch) | |
| tree | c4e28d990eaa525916ab09f2bd1d9c6ddf2c8dea /sys/vm/swap_pager.c | |
| parent | 71e3b145e380a641c1129e0363ecb2f5ebbb09f2 (diff) | |
| download | src-cb05b60a8982e5497cd30449710deb2f4be653d4.tar.gz src-cb05b60a8982e5497cd30449710deb2f4be653d4.zip | |
vn_lock() is currently only used with the 'curthread' passed as argument.
Remove this argument and pass curthread directly to underlying
VOP_LOCK1() VFS method. This modify makes the code cleaner and in
particular remove an annoying dependence helping next lockmgr() cleanup.
KPI results, obviously, changed.
Manpage and FreeBSD_version will be updated through further commits.
As a side note, would be valuable to say that next commits will address
a similar cleanup about VFS methods, in particular vop_lock1 and
vop_unlock.
Tested by: Diego Sardina <siarodx at gmail dot com>,
Andrea Di Pasquale <whyx dot it at gmail dot com>
Notes
Notes:
svn path=/head/; revision=175202
Diffstat (limited to 'sys/vm/swap_pager.c')
| -rw-r--r-- | sys/vm/swap_pager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 97acee378967..2350cf3f312a 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2118,7 +2118,7 @@ swapoff_one(struct swdevt *sp, struct ucred *cred) mtx_assert(&Giant, MA_OWNED); #ifdef MAC - (void) vn_lock(sp->sw_vp, LK_EXCLUSIVE | LK_RETRY, curthread); + (void) vn_lock(sp->sw_vp, LK_EXCLUSIVE | LK_RETRY); error = mac_system_check_swapoff(cred, sp->sw_vp); (void) VOP_UNLOCK(sp->sw_vp, 0, curthread); if (error != 0) @@ -2458,7 +2458,7 @@ swapongeom(struct thread *td, struct vnode *vp) int error; struct swh0h0 swh; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); swh.dev = vp->v_rdev; swh.vp = vp; @@ -2527,7 +2527,7 @@ swaponvp(struct thread *td, struct vnode *vp, u_long nblks) } mtx_unlock(&sw_dev_mtx); - (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC error = mac_system_check_swapon(td->td_ucred, vp); if (error == 0) |