diff options
author | rwatson <rwatson@FreeBSD.org> | 2009-04-10 10:52:19 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2009-04-10 10:52:19 +0000 |
commit | fba90f2e037dd422279bc69cd0265942148c0022 (patch) | |
tree | 60ec81c960bc903ee02261b0b6fa507c405c3d75 /sys/cddl | |
parent | a5ecda6fd6358d3ff6a18998f98482335fb6c884 (diff) | |
download | FreeBSD-src-fba90f2e037dd422279bc69cd0265942148c0022.zip FreeBSD-src-fba90f2e037dd422279bc69cd0265942148c0022.tar.gz |
Remove VOP_LEASE and supporting functions. This hasn't been used since
the removal of NQNFS, but was left in in case it was required for NFSv4.
Since our new NFSv4 client and server can't use it for their
requirements, GC the old mechanism, as well as other unused lease-
related code and interfaces.
Due to its impact on kernel programming and binary interfaces, this
change should not be MFC'd.
Proposed by: jeff
Reviewed by: jeff
Discussed with: rmacklem, zach loafman @ isilon
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/vnode.h | 1 | ||||
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/vnode.h b/sys/cddl/compat/opensolaris/sys/vnode.h index 616e11a..68288a7 100644 --- a/sys/cddl/compat/opensolaris/sys/vnode.h +++ b/sys/cddl/compat/opensolaris/sys/vnode.h @@ -217,7 +217,6 @@ zfs_vn_rdwr(enum uio_rw rw, vnode_t *vp, caddr_t base, ssize_t len, vfslocked = VFS_LOCK_GIANT(vp->v_mount); if (rw == UIO_WRITE) { ioflag = IO_SYNC; - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); } else { ioflag = IO_DIRECT; } diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index f213d10..7792f6e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -4577,7 +4577,6 @@ vop_deleteextattr { ZFS_EXIT(zfsvfs); return (error); } - VOP_LEASE(nd.ni_dvp, td, ap->a_cred, LEASE_WRITE); error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); vput(nd.ni_dvp); @@ -4639,7 +4638,6 @@ vop_setextattr { return (error); } - VOP_LEASE(vp, td, ap->a_cred, LEASE_WRITE); VATTR_NULL(&va); va.va_size = 0; error = VOP_SETATTR(vp, &va, ap->a_cred); |