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/fdescfs | |
| 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/fdescfs')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 5c39978..12ab09b 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -149,7 +149,7 @@ fdesc_root(mp, flags, vpp, td) */ vp = VFSTOFDESC(mp)->f_root; VREF(vp); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); *vpp = vp; return (0); } diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index a293b9c..6237362 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -234,7 +234,7 @@ fdesc_lookup(ap) goto bad; VTOFDESC(fvp)->fd_fd = fd; if (fvp != dvp) - vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY); *vpp = fvp; return (0); @@ -409,7 +409,7 @@ fdesc_setattr(ap) } vp = fp->f_vnode; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) == 0) { - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_SETATTR(vp, ap->a_vap, ap->a_cred, ap->a_td); VOP_UNLOCK(vp, 0, ap->a_td); vn_finished_write(mp); |
