From ca1e4c2fe08ddca6d8bb843c635cb05b2ccf61ae Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 29 Mar 2005 13:09:42 +0000 Subject: - Remove wantparent, it is no longer necessary. An assert in vfs_lookup.c prevents any callers from doing a modifying op without LOCKPARENT or WANTPARENT. --- sys/nfs4client/nfs4_vnops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/nfs4client') diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c index 8877a95..50947e0 100644 --- a/sys/nfs4client/nfs4_vnops.c +++ b/sys/nfs4client/nfs4_vnops.c @@ -937,7 +937,7 @@ nfs4_lookup(struct vop_lookup_args *ap) long len; nfsfh_t *fhp; struct nfsnode *np; - int wantparent, error = 0, fhsize; + int error = 0, fhsize; struct thread *td = cnp->cn_thread; struct nfs4_compound cp; struct nfs4_oparg_getattr ga, dga; @@ -950,7 +950,6 @@ nfs4_lookup(struct vop_lookup_args *ap) return (EROFS); if (dvp->v_type != VDIR) return (ENOTDIR); - wantparent = flags & (LOCKPARENT|WANTPARENT); nmp = VFSTONFS(dvp->v_mount); np = VTONFS(dvp); @@ -1030,7 +1029,7 @@ nfs4_lookup(struct vop_lookup_args *ap) /* * Handle RENAME case... */ - if (cnp->cn_nameiop == RENAME && wantparent && (flags & ISLASTCN)) { + if (cnp->cn_nameiop == RENAME && (flags & ISLASTCN)) { if (NFS_CMPFH(np, fhp, fhsize)) return (EISDIR); -- cgit v1.1