summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2008-02-25 18:45:57 +0000
committerattilio <attilio@FreeBSD.org>2008-02-25 18:45:57 +0000
commit4014b558307253555f43f360be60f49ea39b7ceb (patch)
treed455fa541ca0d9b761f28e9c67c92fd959e44b2c /sys/contrib
parent49cb35343eeaa02f4e480228eb7148a3305d3b70 (diff)
downloadFreeBSD-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/contrib')
-rw-r--r--sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index 8ba0461..8c67a59 100644
--- a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -1113,7 +1113,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
int ltype = 0;
if (cnp->cn_flags & ISDOTDOT) {
- ltype = VOP_ISLOCKED(dvp, td);
+ ltype = VOP_ISLOCKED(dvp);
VOP_UNLOCK(dvp, 0);
}
error = vn_lock(*vpp, cnp->cn_lkflags);
@@ -1171,7 +1171,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
/* ARGSUSED */
static int
zfs_create(vnode_t *dvp, char *name, vattr_t *vap, int excl, int mode,
- vnode_t **vpp, cred_t *cr, kthread_t *td)
+ vnode_t **vpp, cred_t *cr)
{
znode_t *zp, *dzp = VTOZ(dvp);
zfsvfs_t *zfsvfs = dzp->z_zfsvfs;
@@ -3245,7 +3245,7 @@ zfs_freebsd_create(ap)
mode = vap->va_mode & ALLPERMS;
return (zfs_create(ap->a_dvp, cnp->cn_nameptr, vap, !EXCL, mode,
- ap->a_vpp, cnp->cn_cred, cnp->cn_thread));
+ ap->a_vpp, cnp->cn_cred));
}
static int
OpenPOWER on IntegriCloud