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/kern/vfs_vnops.c | |
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/kern/vfs_vnops.c')
-rw-r--r-- | sys/kern/vfs_vnops.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 681c0eb..48a74ac 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -153,14 +153,10 @@ restart: #ifdef MAC error = mac_vnode_check_create(cred, ndp->ni_dvp, &ndp->ni_cnd, vap); - if (error == 0) { + if (error == 0) #endif - VOP_LEASE(ndp->ni_dvp, td, cred, LEASE_WRITE); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, vap); -#ifdef MAC - } -#endif vput(ndp->ni_dvp); vn_finished_write(mp); if (error) { @@ -521,7 +517,6 @@ vn_read(fp, uio, active_cred, flags, td) if (fp->f_flag & O_DIRECT) ioflag |= IO_DIRECT; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - VOP_LEASE(vp, td, fp->f_cred, LEASE_READ); /* * According to McKusick the vn lock was protecting f_offset here. * It is now protected by the FOFFSET_LOCKED flag. @@ -598,7 +593,6 @@ vn_write(fp, uio, active_cred, flags, td) if (vp->v_type != VCHR && (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto unlock; - VOP_LEASE(vp, td, fp->f_cred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if ((flags & FOF_OFFSET) == 0) uio->uio_offset = fp->f_offset; @@ -642,7 +636,6 @@ vn_truncate(fp, length, active_cred, td) VFS_UNLOCK_GIANT(vfslocked); return (error); } - VOP_LEASE(vp, td, active_cred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (vp->v_type == VDIR) { error = EISDIR; |