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/coda | |
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/coda')
-rw-r--r-- | sys/fs/coda/coda_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/coda/coda_vnops.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index 27da6e2..c0a7868 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -297,7 +297,7 @@ coda_root(vfsp, flags, vpp, td) /* On Mach, this is vref. On NetBSD, VOP_LOCK */ #if 1 vref(*vpp); - vn_lock(*vpp, LK_EXCLUSIVE, td); + vn_lock(*vpp, LK_EXCLUSIVE); #else vget(*vpp, LK_EXCLUSIVE, td); #endif @@ -320,7 +320,7 @@ coda_root(vfsp, flags, vpp, td) *vpp = mi->mi_rootvp; #if 1 vref(*vpp); - vn_lock(*vpp, LK_EXCLUSIVE, td); + vn_lock(*vpp, LK_EXCLUSIVE); #else vget(*vpp, LK_EXCLUSIVE, td); #endif @@ -340,7 +340,7 @@ coda_root(vfsp, flags, vpp, td) *vpp = mi->mi_rootvp; #if 1 vref(*vpp); - vn_lock(*vpp, LK_EXCLUSIVE, td); + vn_lock(*vpp, LK_EXCLUSIVE); #else vget(*vpp, LK_EXCLUSIVE, td); #endif diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index 19d31a6..51f9d62 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -931,11 +931,11 @@ coda_lookup(struct vop_lookup_args *ap) */ if (*ap->a_vpp) { if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE, td))) { - vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE, td); + vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE); return (error); } } - vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE, td); + vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE); } else { /* The parent is locked, and may be the same as the child */ if (*ap->a_vpp && (*ap->a_vpp != dvp)) { |