--- //depot/vendor/freebsd/src/ObsoleteFiles.inc 2008/08/24 10:36:08 +++ //depot/user/attilio/attilio_vfs/ObsoleteFiles.inc 2008/08/28 15:33:21 @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080829: removal of nomore used VOP_LEASE(9) manpage +OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown # 20080820: MPSAFE TTY layer integrated --- //depot/vendor/freebsd/src/share/man/man9/Makefile 2008/08/28 17:35:20 +++ //depot/user/attilio/attilio_vfs/share/man/man9/Makefile 2008/08/28 19:15:55 @@ -330,7 +330,6 @@ VOP_GETVOBJECT.9 \ VOP_INACTIVE.9 \ VOP_IOCTL.9 \ - VOP_LEASE.9 \ VOP_LINK.9 \ VOP_LISTEXTATTR.9 \ VOP_LOCK.9 \ --- //depot/vendor/freebsd/src/sys/cddl/compat/opensolaris/sys/vnode.h 2008/03/28 22:20:20 +++ //depot/user/attilio/attilio_vfs/sys/cddl/compat/opensolaris/sys/vnode.h 2008/08/27 20:04:09 @@ -199,7 +199,6 @@ ioflag = IO_APPEND | IO_UNIT; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); error = vn_rdwr(rw, vp, base, len, offset, seg, ioflag, cr, NOCRED, &resid, td); VFS_UNLOCK_GIANT(vfslocked); --- //depot/vendor/freebsd/src/sys/fs/devfs/devfs_vnops.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/fs/devfs/devfs_vnops.c 2008/08/30 13:13:24 @@ -1463,7 +1463,6 @@ .vop_create = VOP_PANIC, .vop_fsync = devfs_fsync, .vop_getattr = devfs_getattr, - .vop_lease = VOP_NULL, .vop_link = VOP_PANIC, .vop_mkdir = VOP_PANIC, .vop_mknod = VOP_PANIC, --- //depot/vendor/freebsd/src/sys/fs/fifofs/fifo_vnops.c 2008/03/12 10:16:51 +++ //depot/user/attilio/attilio_vfs/sys/fs/fifofs/fifo_vnops.c 2008/08/27 20:04:09 @@ -118,7 +118,6 @@ .vop_getattr = VOP_EBADF, .vop_ioctl = fifo_ioctl, .vop_kqfilter = fifo_kqfilter, - .vop_lease = VOP_NULL, .vop_link = VOP_PANIC, .vop_mkdir = VOP_PANIC, .vop_mknod = VOP_PANIC, --- //depot/vendor/freebsd/src/sys/fs/unionfs/union_subr.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/fs/unionfs/union_subr.c 2008/08/30 13:13:24 @@ -819,10 +819,6 @@ if ((error = vn_start_write(udvp, &mp, V_WAIT | PCATCH))) goto unionfs_mkshadowdir_free_out; - if ((error = VOP_LEASE(udvp, td, cn.cn_cred, LEASE_WRITE))) { - vn_finished_write(mp); - goto unionfs_mkshadowdir_free_out; - } unionfs_create_uppervattr_core(ump, &lva, &va, td); error = VOP_MKDIR(udvp, &uvp, &cn, &va); @@ -888,8 +884,6 @@ if ((error = vn_start_write(dvp, &mp, V_WAIT | PCATCH))) goto unionfs_mkwhiteout_free_out; - if (!(error = VOP_LEASE(dvp, td, td->td_ucred, LEASE_WRITE))) - error = VOP_WHITEOUT(dvp, &cn, CREATE); vn_finished_write(mp); @@ -963,9 +957,6 @@ goto unionfs_vn_create_on_upper_free_out1; } - if ((error = VOP_LEASE(udvp, td, cred, LEASE_WRITE)) != 0) - goto unionfs_vn_create_on_upper_free_out1; - if ((error = VOP_CREATE(udvp, &vp, &cn, uvap)) != 0) goto unionfs_vn_create_on_upper_free_out1; @@ -1013,10 +1004,6 @@ uio.uio_segflg = UIO_SYSSPACE; uio.uio_offset = 0; - if ((error = VOP_LEASE(lvp, td, cred, LEASE_READ)) != 0) - return (error); - if ((error = VOP_LEASE(uvp, td, cred, LEASE_WRITE)) != 0) - return (error); buf = malloc(MAXBSIZE, M_TEMP, M_WAITOK); while (error == 0) { --- //depot/vendor/freebsd/src/sys/fs/unionfs/union_vnops.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/fs/unionfs/union_vnops.c 2008/08/30 13:13:24 @@ -845,25 +845,6 @@ } static int -unionfs_lease(struct vop_lease_args *ap) -{ - int error; - struct unionfs_node *unp; - struct vnode *vp; - - UNIONFS_INTERNAL_DEBUG("unionfs_lease: enter\n"); - - unp = VTOUNIONFS(ap->a_vp); - vp = (unp->un_uppervp != NULLVP ? unp->un_uppervp : unp->un_lowervp); - - error = VOP_LEASE(vp, ap->a_td, ap->a_cred, ap->a_flag); - - UNIONFS_INTERNAL_DEBUG("unionfs_lease: lease (%d)\n", error); - - return (error); -} - -static int unionfs_ioctl(struct vop_ioctl_args *ap) { int error; @@ -2296,7 +2277,6 @@ .vop_getwritemount = unionfs_getwritemount, .vop_inactive = unionfs_inactive, .vop_ioctl = unionfs_ioctl, - .vop_lease = unionfs_lease, .vop_link = unionfs_link, .vop_listextattr = unionfs_listextattr, .vop_lock1 = unionfs_lock, --- //depot/vendor/freebsd/src/sys/kern/kern_acct.c 2008/08/21 15:05:14 +++ //depot/user/attilio/attilio_vfs/sys/kern/kern_acct.c 2008/08/27 20:04:09 @@ -436,7 +436,6 @@ * Write the accounting information to the file. */ vfslocked = VFS_LOCK_GIANT(acct_vp->v_mount); - VOP_LEASE(acct_vp, td, acct_cred, LEASE_WRITE); ret = vn_rdwr(UIO_WRITE, acct_vp, (caddr_t)&acct, sizeof (acct), (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, acct_cred, NOCRED, (int *)0, td); --- //depot/vendor/freebsd/src/sys/kern/kern_alq.c 2008/07/02 20:45:14 +++ //depot/user/attilio/attilio_vfs/sys/kern/kern_alq.c 2008/08/27 20:04:09 @@ -293,7 +293,7 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - VOP_LEASE(vp, td, alq->aq_cred, LEASE_WRITE); + /* * XXX: VOP_WRITE error checks are ignored. */ --- //depot/vendor/freebsd/src/sys/kern/kern_ktrace.c 2008/02/23 01:05:18 +++ //depot/user/attilio/attilio_vfs/sys/kern/kern_ktrace.c 2008/08/27 20:04:09 @@ -955,7 +955,6 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC error = mac_vnode_check_write(cred, NOCRED, vp); if (error == 0) --- //depot/vendor/freebsd/src/sys/kern/kern_sig.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/kern/kern_sig.c 2008/08/30 13:13:24 @@ -2992,7 +2992,6 @@ if (set_core_nodump_flag) vattr.va_flags = UF_NODUMP; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - VOP_LEASE(vp, td, cred, LEASE_WRITE); VOP_SETATTR(vp, &vattr, cred); VOP_UNLOCK(vp, 0); vn_finished_write(mp); --- //depot/vendor/freebsd/src/sys/kern/uipc_usrreq.c 2008/07/26 01:00:14 +++ //depot/user/attilio/attilio_vfs/sys/kern/uipc_usrreq.c 2008/08/27 20:04:09 @@ -454,10 +454,8 @@ error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif - if (error == 0) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + if (error == 0) error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); - } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (error) { --- //depot/vendor/freebsd/src/sys/kern/vfs_acl.c 2008/03/31 12:06:01 +++ //depot/user/attilio/attilio_vfs/sys/kern/vfs_acl.c 2008/08/27 20:04:09 @@ -91,7 +91,6 @@ error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error != 0) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC error = mac_vnode_check_setacl(td->td_ucred, vp, type, &inkernacl); @@ -117,7 +116,6 @@ struct acl inkernelacl; int error; - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC error = mac_vnode_check_getacl(td->td_ucred, vp, type); @@ -146,7 +144,6 @@ error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC error = mac_vnode_check_deleteacl(td->td_ucred, vp, type); --- //depot/vendor/freebsd/src/sys/kern/vfs_default.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/kern/vfs_default.c 2008/08/30 13:13:24 @@ -87,7 +87,6 @@ .vop_ioctl = VOP_ENOTTY, .vop_kqfilter = vop_stdkqfilter, .vop_islocked = vop_stdislocked, - .vop_lease = VOP_NULL, .vop_lock1 = vop_stdlock, .vop_lookup = vop_nolookup, .vop_open = VOP_NULL, --- //depot/vendor/freebsd/src/sys/kern/vfs_extattr.c 2008/03/31 12:06:01 +++ //depot/user/attilio/attilio_vfs/sys/kern/vfs_extattr.c 2008/08/27 20:04:09 @@ -162,7 +162,6 @@ error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); aiov.iov_base = data; @@ -328,7 +327,6 @@ int error; VFS_ASSERT_GIANT(vp->v_mount); - VOP_LEASE(vp, td, td->td_ucred, LEASE_READ); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* @@ -509,7 +507,6 @@ error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC @@ -651,7 +648,6 @@ int error; VFS_ASSERT_GIANT(vp->v_mount); - VOP_LEASE(vp, td, td->td_ucred, LEASE_READ); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); auiop = NULL; --- //depot/vendor/freebsd/src/sys/kern/vfs_syscalls.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/kern/vfs_syscalls.c 2008/08/30 13:13:24 @@ -1139,7 +1139,6 @@ if (flags & O_TRUNC) { if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto bad; - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); VATTR_NULL(&vat); vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); @@ -1331,7 +1330,6 @@ &nd.ni_cnd, &vattr); #endif if (!error) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); if (whiteout) error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, CREATE); else { @@ -1438,7 +1436,6 @@ if (error) goto out; #endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); if (error == 0) vput(nd.ni_vp); @@ -1584,8 +1581,6 @@ error = EEXIST; } else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY)) == 0) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); error = can_hardlink(vp, td->td_ucred); if (error == 0) #ifdef MAC @@ -1705,7 +1700,6 @@ if (error) goto out2; #endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, syspath); if (error == 0) vput(nd.ni_vp); @@ -1765,7 +1759,6 @@ return (error); goto restart; } - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, DELETE); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -1871,7 +1864,6 @@ if (error) goto out; #endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); #ifdef MAC out: @@ -2629,7 +2621,6 @@ if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); VATTR_NULL(&vattr); vattr.va_flags = flags; @@ -2757,7 +2748,6 @@ if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); VATTR_NULL(&vattr); vattr.va_mode = mode & ALLPERMS; @@ -2920,7 +2910,6 @@ if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); VATTR_NULL(&vattr); vattr.va_uid = uid; @@ -3134,7 +3123,6 @@ if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) return (error); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); setbirthtime = 0; if (numtimes < 3 && !VOP_GETATTR(vp, &vattr, td->td_ucred) && @@ -3365,7 +3353,6 @@ return (error); } NDFREE(&nd, NDF_ONLY_PNBUF); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (vp->v_type == VDIR) error = EISDIR; @@ -3607,13 +3594,6 @@ #endif out: if (!error) { - VOP_LEASE(tdvp, td, td->td_ucred, LEASE_WRITE); - if (fromnd.ni_dvp != tdvp) { - VOP_LEASE(fromnd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - } - if (tvp) { - VOP_LEASE(tvp, td, td->td_ucred, LEASE_WRITE); - } error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); NDFREE(&fromnd, NDF_ONLY_PNBUF); @@ -3739,7 +3719,6 @@ if (error) goto out; #endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); #ifdef MAC out: @@ -3832,8 +3811,6 @@ return (error); goto restart; } - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd); vn_finished_write(mp); out: @@ -4406,7 +4383,6 @@ vrele(vp); goto out; } - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* XXX */ #ifdef MAC /* --- //depot/vendor/freebsd/src/sys/kern/vfs_vnops.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/kern/vfs_vnops.c 2008/08/30 13:13:24 @@ -154,7 +154,6 @@ &ndp->ni_cnd, vap); 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 @@ -512,7 +511,6 @@ 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. @@ -589,7 +587,6 @@ 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; @@ -633,7 +630,6 @@ 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; --- //depot/vendor/freebsd/src/sys/kern/vnode_if.src 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/kern/vnode_if.src 2008/08/30 13:13:24 @@ -194,16 +194,6 @@ }; -%% lease vp = = = - -vop_lease { - IN struct vnode *vp; - IN struct thread *td; - IN struct ucred *cred; - IN int flag; -}; - - %% ioctl vp U U U vop_ioctl { --- //depot/vendor/freebsd/src/sys/nfs4client/nfs4_vnops.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/nfs4client/nfs4_vnops.c 2008/08/30 13:13:24 @@ -173,7 +173,6 @@ .vop_getpages = nfs_getpages, .vop_putpages = nfs_putpages, .vop_inactive = nfs_inactive, - .vop_lease = VOP_NULL, .vop_link = nfs4_link, .vop_lookup = nfs4_lookup, .vop_mkdir = nfs4_mkdir, --- //depot/vendor/freebsd/src/sys/nfsclient/nfs_vnops.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/nfsclient/nfs_vnops.c 2008/08/30 13:13:24 @@ -145,7 +145,6 @@ .vop_getpages = nfs_getpages, .vop_putpages = nfs_putpages, .vop_inactive = nfs_inactive, - .vop_lease = VOP_NULL, .vop_link = nfs_link, .vop_lookup = nfs_lookup, .vop_mkdir = nfs_mkdir, --- //depot/vendor/freebsd/src/sys/sys/vnode.h 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/sys/vnode.h 2008/08/30 13:13:24 @@ -383,12 +383,6 @@ extern int prtactive; /* nonzero to call vprint() */ extern struct vattr va_null; /* predefined null vattr structure */ -/* - * Macro/function to check for client cache inconsistency w.r.t. leasing. - */ -#define LEASE_READ 0x1 /* Check lease for readers */ -#define LEASE_WRITE 0x2 /* Check lease for modifiers */ - extern void (*lease_updatetime)(int deltat); #define VI_LOCK(vp) mtx_lock(&(vp)->v_interlock) @@ -558,8 +552,6 @@ struct vattr; struct vnode; -extern int (*lease_check_hook)(struct vop_lease_args *); - /* cache_* may belong in namei.h. */ void cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp); @@ -577,7 +569,6 @@ void (*dtr)(struct vnode *, void *), void *dtr_arg); int insmntque(struct vnode *vp, struct mount *mp); u_quad_t init_va_filerev(void); -int lease_check(struct vop_lease_args *ap); int speedup_syncer(void); #define textvp_fullpath(p, rb, rfb) \ vn_fullpath(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb) --- //depot/vendor/freebsd/src/sys/ufs/ffs/ffs_snapshot.c 2008/08/29 20:38:26 +++ //depot/user/attilio/attilio_vfs/sys/ufs/ffs/ffs_snapshot.c 2008/08/30 13:13:24 @@ -279,7 +279,6 @@ return (error); goto restart; } - VOP_LEASE(nd.ni_dvp, td, KERNCRED, LEASE_WRITE); error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vat); VOP_UNLOCK(nd.ni_dvp, 0); if (error) {