diff options
| author | attilio <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
| commit | 18d0a0dd51c7995ce9e549616f78ef724096b1bd (patch) | |
| tree | c4e28d990eaa525916ab09f2bd1d9c6ddf2c8dea /sys/fs/nullfs | |
| parent | 8df9c26bfdf7538c15226c902c07a0fe350ace36 (diff) | |
| download | FreeBSD-src-18d0a0dd51c7995ce9e549616f78ef724096b1bd.zip FreeBSD-src-18d0a0dd51c7995ce9e549616f78ef724096b1bd.tar.gz | |
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>
Diffstat (limited to 'sys/fs/nullfs')
| -rw-r--r-- | sys/fs/nullfs/null_subr.c | 2 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 496be3c..d6a31d1 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -192,7 +192,7 @@ null_insmntque_dtr(struct vnode *vp, void *xp) vp->v_vnlock = &vp->v_lock; FREE(xp, M_NULLFSNODE); vp->v_op = &dead_vnodeops; - (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vgone(vp); vput(vp); } diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 02cdc40..9f1caf8 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -121,7 +121,7 @@ nullfs_mount(struct mount *mp, struct thread *td) * Re-lock vnode. */ if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) - vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY); if (error) return (error); @@ -250,7 +250,7 @@ nullfs_root(mp, flags, vpp, td) if (VOP_ISLOCKED(vp, NULL)) panic("root vnode is locked.\n"); #endif - vn_lock(vp, flags | LK_RETRY, td); + vn_lock(vp, flags | LK_RETRY); *vpp = vp; return 0; } |
