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/fs/nullfs | |
| 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/fs/nullfs')
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 95914f4..7c93dd9 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -107,7 +107,7 @@ nullfs_mount(struct mount *mp, struct thread *td) * (XXX) VOP_ISLOCKED is needed? */ if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) && - VOP_ISLOCKED(mp->mnt_vnodecovered, curthread)) { + VOP_ISLOCKED(mp->mnt_vnodecovered)) { VOP_UNLOCK(mp->mnt_vnodecovered, 0); isvnunlocked = 1; } @@ -120,7 +120,7 @@ nullfs_mount(struct mount *mp, struct thread *td) /* * Re-lock vnode. */ - if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, curthread)) + if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered)) vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY); if (error) @@ -247,7 +247,7 @@ nullfs_root(mp, flags, vpp, td) VREF(vp); #ifdef NULLFS_DEBUG - if (VOP_ISLOCKED(vp, curthread)) + if (VOP_ISLOCKED(vp)) panic("root vnode is locked.\n"); #endif vn_lock(vp, flags | LK_RETRY); diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index d0193fc..ca7ed0c 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -619,9 +619,8 @@ static int null_islocked(struct vop_islocked_args *ap) { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; - return (lockstatus(vp->v_vnlock, td)); + return (lockstatus(vp->v_vnlock)); } /* |
