Introduce NDFREE (and remove VOP_ABORTOP)

5 files changed, 27 insertions, 161 deletions

diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 4db6fc2..89cbdce 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -388,20 +388,3 @@ nfs_islocked(ap)
 }
 #endif
 
-/*
- * Nfs abort op, called after namei() when a CREATE/DELETE isn't actually
- * done. Currently nothing to do.
- */
-/* ARGSUSED */
-int
-nfs_abortop(ap)
-	struct vop_abortop_args /* {
-		struct vnode *a_dvp;
-		struct componentname *a_cnp;
-	} */ *ap;
-{
-
-	if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
-		zfree(namei_zone, ap->a_cnp->cn_pnbuf);
-	return (0);
-}
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index ffaeea7..405e437 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -61,21 +61,13 @@
  *	and note that nfsm_*() macros can terminate a procedure on certain
  *	errors.
  *
- *	VOP_ABORTOP() only frees the path component if HASBUF is set and
- *	SAVESTART is *not* set.
- *
- *	Various VOP_*() routines tend to free the path component if an 
- *	error occurs.  If no error occurs, the VOP_*() routines only free
- *	the path component if SAVESTART is NOT set.
- *
  *	lookup() and namei()
  *	may return garbage in various structural fields/return elements
  *	if an error is returned, and may garbage up nd.ni_dvp even if no
  *	error is returned and you did not request LOCKPARENT or WANTPARENT.
  *
  *	We use the ni_cnd.cn_flags 'HASBUF' flag to track whether the name
- *	buffer has been freed or not.  This is unique to nfs_serv.c for
- *	the moment, the rest of the system sets HASBUF but never clears it.
+ *	buffer has been freed or not.
  */
 
 #include <sys/param.h>
@@ -604,8 +596,7 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
 	 */
 	vrele(ndp->ni_startdir);
 	ndp->ni_startdir = NULL;
-	zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
-	nd.ni_cnd.cn_flags &= ~HASBUF;
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 
 	/*
 	 * Get underlying attribute, then release remaining resources ( for
@@ -638,8 +629,7 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
 nfsmout:
 	if (dirp)
 		vrele(dirp);
-	if (nd.ni_cnd.cn_flags & HASBUF)
-		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (ndp->ni_startdir)
 		vrele(ndp->ni_startdir);
 	if (ndp->ni_vp)
@@ -1736,9 +1726,9 @@ nfsrv_create(nfsd, slp, procp, mrq)
 		if (vap->va_type == VREG || vap->va_type == VSOCK) {
 			nqsrv_getl(nd.ni_dvp, ND_WRITE);
 			error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-			if (error) {
-				nd.ni_cnd.cn_flags &= ~HASBUF;
-			} else {
+			if (error)
+				NDFREE(&nd, NDF_ONLY_PNBUF);
+			else {
 			    	nfsrv_object_create(nd.ni_vp);
 				if (exclusive_flag) {
 					exclusive_flag = 0;
@@ -1769,7 +1759,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 
 			error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
 			if (error) {
-				nd.ni_cnd.cn_flags &= ~HASBUF;
+				NDFREE(&nd, NDF_ONLY_PNBUF);
 				goto nfsmreply0;
 			}
 			vput(nd.ni_vp);
@@ -1864,15 +1854,7 @@ nfsmout:
 	}
 	if (dirp)
 		vrele(dirp);
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since SAVESTART is set, we own the buffer and need to
-		 * zfree it ourselves.
-		 */
-		if (nd.ni_dvp)
-			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -1970,7 +1952,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 		nqsrv_getl(nd.ni_dvp, ND_WRITE);
 		error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
 		if (error)
-			nd.ni_cnd.cn_flags &= ~HASBUF;
+			NDFREE(&nd, NDF_ONLY_PNBUF);
 	} else {
 		if (vtyp != VFIFO && (error = suser_xxx(cred, 0, 0)))
 			goto out;
@@ -1978,7 +1960,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 
 		error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
 		if (error) {
-			nd.ni_cnd.cn_flags &= ~HASBUF;
+			NDFREE(&nd, NDF_ONLY_PNBUF);
 			goto out;
 		}
 		vput(nd.ni_vp);
@@ -2012,16 +1994,7 @@ out:
 		vrele(nd.ni_startdir);
 		nd.ni_startdir = NULL;
 	}
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since SAVESTART is set, we own the buffer and need to
-		 * zfree it ourselves.
-		 */
-		if (nd.ni_dvp)
-			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		nd.ni_cnd.cn_flags &= ~HASBUF;
-		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -2057,15 +2030,7 @@ nfsmout:
 		vrele(dirp);
 	if (nd.ni_startdir)
 		vrele(nd.ni_startdir);
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since SAVESTART is set, we own the buffer and need to
-		 * zfree it ourselves.
-		 */
-		if (nd.ni_dvp)
-			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -2143,7 +2108,7 @@ out:
 			nqsrv_getl(nd.ni_dvp, ND_WRITE);
 			nqsrv_getl(nd.ni_vp, ND_WRITE);
 			error = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
-			nd.ni_cnd.cn_flags &= ~HASBUF;
+			NDFREE(&nd, NDF_ONLY_PNBUF);
 		}
 	}
 	if (dirp && v3) {
@@ -2157,14 +2122,7 @@ out:
 		error = 0;
 	}
 nfsmout:
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since SAVESTART is not set, this is sufficient to free
-		 * the component buffer.  It's actually a NOP since we
-		 * do not save the name, but what the hey.
-		 */
-		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -2327,11 +2285,6 @@ nfsrv_rename(nfsd, slp, procp, mrq)
 out:
 	if (!error) {
 		/*
-		 * Do rename.  If an error occured, the underlying path
-		 * components are freed by the VOP routine.  If no error
-		 * occured, the SAVESTART flag prevents them from being
-		 * freed.
-		 *
 		 * The VOP_RENAME function releases all vnode references &
 		 * locks prior to returning so we need to clear the pointers
 		 * to bypass cleanup code later on.
@@ -2378,15 +2331,7 @@ nfsmout:
 		vrele(tdirp);
 	if (tond.ni_startdir)
 		vrele(tond.ni_startdir);
-	if (tond.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * The VOP_ABORTOP is probably a NOP.  Since we have set
-		 * SAVESTART, we need to zfree the buffer ourselves.
-		 */
-		if (tond.ni_dvp)
-			VOP_ABORTOP(tond.ni_dvp, &tond.ni_cnd);
-		zfree(namei_zone, tond.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&tond, NDF_ONLY_PNBUF);
 	if (tond.ni_dvp) {
 		if (tond.ni_dvp == tond.ni_vp)
 			vrele(tond.ni_dvp);
@@ -2403,11 +2348,7 @@ nfsmout:
 		vrele(fdirp);
 	if (fromnd.ni_startdir)
 		vrele(fromnd.ni_startdir);
-	if (fromnd.ni_cnd.cn_flags & HASBUF) {
-		if (fromnd.ni_dvp)
-			VOP_ABORTOP(fromnd.ni_dvp, &fromnd.ni_cnd);
-		zfree(namei_zone, fromnd.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&fromnd, NDF_ONLY_PNBUF);
 	if (fromnd.ni_dvp)
 		vrele(fromnd.ni_dvp);
 	if (fromnd.ni_vp)
@@ -2494,15 +2435,10 @@ nfsrv_link(nfsd, slp, procp, mrq)
 		error = EXDEV;
 out:
 	if (!error) {
-		/*
-		 * Do the link op.  Since SAVESTART is not set, the 
-		 * underlying path component is freed whether an error
-		 * is returned or not.
-		 */
 		nqsrv_getl(vp, ND_WRITE);
 		nqsrv_getl(xp, ND_WRITE);
 		error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
-		nd.ni_cnd.cn_flags &= ~HASBUF;
+		NDFREE(&nd, NDF_ONLY_PNBUF);
 	}
 	/* fall through */
 
@@ -2520,14 +2456,7 @@ out1:
 	/* fall through */
 
 nfsmout:
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since we are not using SAVESTART,
-		 * VOP_ABORTOP is sufficient to free the path component
-		 */
-		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		/* zfree(namei_zone, nd.ni_cnd.cn_pnbuf); */
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (dirp)
 		vrele(dirp);
 	if (vp)
@@ -2629,7 +2558,7 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 	nqsrv_getl(nd.ni_dvp, ND_WRITE);
 	error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap, pathcp);
 	if (error)
-		nd.ni_cnd.cn_flags &= ~HASBUF;
+		NDFREE(&nd, NDF_ONLY_PNBUF);
 	else {
 		vput(nd.ni_vp);
 		nd.ni_vp = NULL;
@@ -2700,15 +2629,7 @@ out:
 	/* fall through */
 
 nfsmout:
-	if (nd.ni_cnd.cn_flags & HASBUF) {
-		/*
-		 * Since SAVESTART is set, we own the buffer and need to
-		 * zfree it ourselves.
-		 */
-		if (nd.ni_dvp)
-			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
-	}
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -2801,12 +2722,7 @@ nfsrv_mkdir(nfsd, slp, procp, mrq)
 
 	vap->va_type = VDIR;
 	if (nd.ni_vp != NULL) {
-		/*
-		 * Freeup path component.  Since SAVESTART was not set,
-		 * VOP_ABORTOP() will handle it.
-		 */
-		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-		nd.ni_cnd.cn_flags &= ~HASBUF;
+		NDFREE(&nd, NDF_ONLY_PNBUF);
 		error = EEXIST;
 		goto out;
 	}
@@ -2818,7 +2734,7 @@ nfsrv_mkdir(nfsd, slp, procp, mrq)
 	 */
 	nqsrv_getl(nd.ni_dvp, ND_WRITE);
 	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-	nd.ni_cnd.cn_flags &= ~HASBUF;
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vpexcl = 1;
 
 	vput(nd.ni_dvp);
@@ -2853,12 +2769,7 @@ nfsmout:
 	if (dirp)
 		vrele(dirp);
 	if (nd.ni_dvp) {
-		/*
-		 * Since SAVESTART is not set, VOP_ABORTOP will always free
-		 * the path component.
-		 */
-		if (nd.ni_cnd.cn_flags & HASBUF)
-			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
+		NDFREE(&nd, NDF_ONLY_PNBUF);
 		if (nd.ni_dvp == nd.ni_vp && vpexcl)
 			vrele(nd.ni_dvp);
 		else
@@ -2953,10 +2864,8 @@ out:
 		nqsrv_getl(nd.ni_dvp, ND_WRITE);
 		nqsrv_getl(vp, ND_WRITE);
 		error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
-	} else {
-		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 	}
-	nd.ni_cnd.cn_flags &= ~HASBUF;
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 
 	if (dirp)
 		diraft_ret = VOP_GETATTR(dirp, &diraft, cred, procp);
@@ -2968,12 +2877,7 @@ out:
 	/* fall through */
 
 nfsmout:
-	/*
-	 * Since SAVESTART is not set, a VOP_ABORTOP is sufficient to
-	 * deal with the pathname component.
-	 */
-	if (nd.ni_cnd.cn_flags & HASBUF)
-		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
+	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (dirp)
 		vrele(dirp);
 	if (nd.ni_dvp) {
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index cd4b351..7519e68 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -55,6 +55,7 @@
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/namei.h>
+#include <vm/vm_zone.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -179,6 +180,7 @@ nfssvc(p, uap)
 		error = namei(&nd);
 		if (error)
 			return (error);
+		NDFREE(&nd, NDF_ONLY_PNBUF);
 		if ((nd.ni_vp->v_flag & VROOT) == 0)
 			error = EINVAL;
 		nmp = VFSTONFS(nd.ni_vp->v_mount);
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 7774b8b..4097d96 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -138,7 +138,6 @@ static int	nfs_bwrite __P((struct vop_bwrite_args *));
 vop_t **nfsv2_vnodeop_p;
 static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vop_defaultop },
-	{ &vop_abortop_desc,		(vop_t *) nfs_abortop },
 	{ &vop_access_desc,		(vop_t *) nfs_access },
 	{ &vop_advlock_desc,		(vop_t *) nfs_advlock },
 	{ &vop_bmap_desc,		(vop_t *) nfs_bmap },
@@ -1249,11 +1248,9 @@ nfs_mknodrpc(dvp, vpp, cnp, vap)
 	else if (vap->va_type == VFIFO || vap->va_type == VSOCK)
 		rdev = nfs_xdrneg1;
 	else {
-		VOP_ABORTOP(dvp, cnp);
 		return (EOPNOTSUPP);
 	}
 	if ((error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) != 0) {
-		VOP_ABORTOP(dvp, cnp);
 		return (error);
 	}
 	nfsstats.rpccnt[NFSPROC_MKNOD]++;
@@ -1304,7 +1301,6 @@ nfs_mknodrpc(dvp, vpp, cnp, vap)
 			cache_enter(dvp, newvp, cnp);
 		*vpp = newvp;
 	}
-	zfree(namei_zone, cnp->cn_pnbuf);
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		VTONFS(dvp)->n_attrstamp = 0;
@@ -1363,7 +1359,6 @@ nfs_create(ap)
 		return (nfs_mknodrpc(dvp, ap->a_vpp, cnp, vap));
 
 	if ((error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) != 0) {
-		VOP_ABORTOP(dvp, cnp);
 		return (error);
 	}
 	if (vap->va_vaflags & VA_EXCLUSIVE)
@@ -1430,8 +1425,6 @@ again:
 			cache_enter(dvp, newvp, cnp);
 		*ap->a_vpp = newvp;
 	}
-	if (error || (cnp->cn_flags & SAVESTART) == 0)
-		zfree(namei_zone, cnp->cn_pnbuf);
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		VTONFS(dvp)->n_attrstamp = 0;
@@ -1503,7 +1496,6 @@ nfs_remove(ap)
 			error = 0;
 	} else if (!np->n_sillyrename)
 		error = nfs_sillyrename(dvp, vp, cnp);
-	zfree(namei_zone, cnp->cn_pnbuf);
 	np->n_attrstamp = 0;
 	return (error);
 }
@@ -1623,14 +1615,12 @@ nfs_rename(ap)
 	}
 
 out:
-	VOP_ABORTOP(tdvp, tcnp);
 	if (tdvp == tvp)
 		vrele(tdvp);
 	else
 		vput(tdvp);
 	if (tvp)
 		vput(tvp);
-	VOP_ABORTOP(fdvp, fcnp);
 	vrele(fdvp);
 	vrele(fvp);
 	/*
@@ -1722,7 +1712,6 @@ nfs_link(ap)
 	int v3;
 
 	if (vp->v_mount != tdvp->v_mount) {
-		VOP_ABORTOP(tdvp, cnp);
 		return (EXDEV);
 	}
 
@@ -1746,7 +1735,6 @@ nfs_link(ap)
 		nfsm_wcc_data(tdvp, wccflag);
 	}
 	nfsm_reqdone;
-	zfree(namei_zone, cnp->cn_pnbuf);
 	VTONFS(tdvp)->n_flag |= NMODIFIED;
 	if (!attrflag)
 		VTONFS(vp)->n_attrstamp = 0;
@@ -1856,12 +1844,6 @@ nfs_symlink(ap)
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		VTONFS(dvp)->n_attrstamp = 0;
-	/*
-	 * cnp's buffer expected to be freed if SAVESTART not set or
-	 * if an error was returned.
-	 */
-	if (error || (cnp->cn_flags & SAVESTART) == 0)
-		zfree(namei_zone, cnp->cn_pnbuf);
 	return (error);
 }
 
@@ -1895,7 +1877,6 @@ nfs_mkdir(ap)
 	int v3 = NFS_ISV3(dvp);
 
 	if ((error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) != 0) {
-		VOP_ABORTOP(dvp, cnp);
 		return (error);
 	}
 	len = cnp->cn_namelen;
@@ -1946,8 +1927,6 @@ nfs_mkdir(ap)
 			vrele(newvp);
 	} else
 		*ap->a_vpp = newvp;
-	if (error || (cnp->cn_flags & SAVESTART) == 0)
-		zfree(namei_zone, cnp->cn_pnbuf);
 	return (error);
 }
 
@@ -1984,7 +1963,6 @@ nfs_rmdir(ap)
 	if (v3)
 		nfsm_wcc_data(dvp, wccflag);
 	nfsm_reqdone;
-	zfree(namei_zone, cnp->cn_pnbuf);
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		VTONFS(dvp)->n_attrstamp = 0;
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 1ca4529..e654bc0 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -194,7 +194,6 @@ int	nfs_getpages __P((struct vop_getpages_args *));
 int	nfs_putpages __P((struct vop_putpages_args *));
 int	nfs_write __P((struct vop_write_args *));
 int	nqnfs_vop_lease_check __P((struct vop_lease_args *));
-int	nfs_abortop __P((struct vop_abortop_args *));
 int	nfs_inactive __P((struct vop_inactive_args *));
 int	nfs_reclaim __P((struct vop_reclaim_args *));