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/nfsclient | |
| 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/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_subs.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index d3a5c08..3bd4980 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -493,7 +493,7 @@ nfs_upgrade_vnlock(struct vnode *vp) { int old_lock; - if ((old_lock = VOP_ISLOCKED(vp, curthread)) != LK_EXCLUSIVE) { + if ((old_lock = VOP_ISLOCKED(vp)) != LK_EXCLUSIVE) { if (old_lock == LK_SHARED) { /* Upgrade to exclusive lock, this might block */ vn_lock(vp, LK_UPGRADE | LK_RETRY); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 2ea2895..1353871 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -1047,8 +1047,7 @@ loop: MNT_VNODE_FOREACH(vp, mp, mvp) { VI_LOCK(vp); MNT_IUNLOCK(mp); - if (VOP_ISLOCKED(vp, curthread) || - vp->v_bufobj.bo_dirty.bv_cnt == 0 || + if (VOP_ISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0 || waitfor == MNT_LAZY) { VI_UNLOCK(vp); MNT_ILOCK(mp); |
