diff options
| author | attilio <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
| commit | 4014b558307253555f43f360be60f49ea39b7ceb (patch) | |
| tree | d455fa541ca0d9b761f28e9c67c92fd959e44b2c /sys/kern/vfs_lookup.c | |
| parent | 49cb35343eeaa02f4e480228eb7148a3305d3b70 (diff) | |
| download | FreeBSD-src-4014b558307253555f43f360be60f49ea39b7ceb.zip FreeBSD-src-4014b558307253555f43f360be60f49ea39b7ceb.tar.gz | |
Axe the 'thread' argument from VOP_ISLOCKED() and lockstatus() as it is
always curthread.
As KPI gets broken by this patch, manpages and __FreeBSD_version will be
updated by further commits.
Tested by: Andrea Barberio <insomniac at slackware dot it>
Diffstat (limited to 'sys/kern/vfs_lookup.c')
| -rw-r--r-- | sys/kern/vfs_lookup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 8c4c612..67ee6cb 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -573,7 +573,7 @@ unionlookup: * last operation. */ if (dp != vp_crossmp && - VOP_ISLOCKED(dp, td) == LK_SHARED && + VOP_ISLOCKED(dp) == LK_SHARED && (cnp->cn_flags & ISLASTCN) && (cnp->cn_flags & LOCKPARENT)) vn_lock(dp, LK_UPGRADE|LK_RETRY); /* @@ -782,7 +782,7 @@ success: * the caller may want it to be exclusively locked. */ if ((cnp->cn_flags & (ISLASTCN | LOCKSHARED | LOCKLEAF)) == - (ISLASTCN | LOCKLEAF) && VOP_ISLOCKED(dp, td) != LK_EXCLUSIVE) { + (ISLASTCN | LOCKLEAF) && VOP_ISLOCKED(dp) != LK_EXCLUSIVE) { vn_lock(dp, LK_UPGRADE | LK_RETRY); } if (vfslocked && dvfslocked) |
