Change the M_NAMEI allocations to use the zone allocator. This change

plus the previous changes to use the zone allocator decrease the useage
of malloc by half.  The Zone allocator will be upgradeable to be able
to use per CPU-pools, and has more intelligent usage of SPLs.  Additionally,
it has reasonable stats gathering capabilities, while making most calls
inline.

1 files changed, 22 insertions, 22 deletions

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index b276f19..d275143 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.49 1997/09/10 19:52:25 phk Exp $
+ * $Id: nfs_serv.c,v 1.50 1997/09/10 20:22:28 phk Exp $
  */
 
 /*
@@ -448,7 +448,7 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
 
 	nqsrv_getl(ndp->ni_startdir, ND_READ);
 	vrele(ndp->ni_startdir);
-	FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+	zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	vp = ndp->ni_vp;
 	bzero((caddr_t)fhp, sizeof(nfh));
 	fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
@@ -1460,7 +1460,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
 			if (!error) {
 			    	nfsrv_object_create(nd.ni_vp);
-				FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+				zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 				if (exclusive_flag) {
 					exclusive_flag = 0;
 					VATTR_NULL(vap);
@@ -1477,7 +1477,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			if (vap->va_type != VFIFO &&
 			    (error = suser(cred, (u_short *)0))) {
 				vrele(nd.ni_startdir);
-				free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+				zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 				vput(nd.ni_dvp);
 				nfsm_reply(0);
@@ -1494,11 +1494,11 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			nd.ni_cnd.cn_proc = procp;
 			nd.ni_cnd.cn_cred = cred;
 			if (error = lookup(&nd)) {
-				free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+				zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 				nfsm_reply(0);
 			}
 			nfsrv_object_create(nd.ni_vp);
-			FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+			zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 			if (nd.ni_cnd.cn_flags & ISSYMLINK) {
 				vrele(nd.ni_dvp);
 				vput(nd.ni_vp);
@@ -1508,7 +1508,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			}
 		} else {
 			vrele(nd.ni_startdir);
-			free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+			zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 			vput(nd.ni_dvp);
 			error = ENXIO;
@@ -1516,7 +1516,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 		vp = nd.ni_vp;
 	} else {
 		vrele(nd.ni_startdir);
-		free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 		vp = nd.ni_vp;
 		if (nd.ni_dvp == vp)
 			vrele(nd.ni_dvp);
@@ -1571,7 +1571,7 @@ nfsmout:
 		vrele(dirp);
 	if (nd.ni_cnd.cn_nameiop) {
 		vrele(nd.ni_startdir);
-		free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	}
 	VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 	if (nd.ni_dvp == nd.ni_vp)
@@ -1635,7 +1635,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 	vtyp = nfsv3tov_type(*tl);
 	if (vtyp != VCHR && vtyp != VBLK && vtyp != VSOCK && vtyp != VFIFO) {
 		vrele(nd.ni_startdir);
-		free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 		error = NFSERR_BADTYPE;
 		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 		vput(nd.ni_dvp);
@@ -1655,7 +1655,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 	 */
 	if (nd.ni_vp) {
 		vrele(nd.ni_startdir);
-		free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 		error = EEXIST;
 		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 		vput(nd.ni_dvp);
@@ -1667,11 +1667,11 @@ 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)
-			FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+			zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	} else {
 		if (vtyp != VFIFO && (error = suser(cred, (u_short *)0))) {
 			vrele(nd.ni_startdir);
-			free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
+			zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 			vput(nd.ni_dvp);
 			goto out;
@@ -1686,7 +1686,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 		nd.ni_cnd.cn_proc = procp;
 		nd.ni_cnd.cn_cred = procp->p_ucred;
 		error = lookup(&nd);
-		FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 		if (error)
 			goto out;
 		if (nd.ni_cnd.cn_flags & ISSYMLINK) {
@@ -1720,7 +1720,7 @@ nfsmout:
 		vrele(dirp);
 	if (nd.ni_cnd.cn_nameiop) {
 		vrele(nd.ni_startdir);
-		free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	}
 	VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 	if (nd.ni_dvp == nd.ni_vp)
@@ -1989,7 +1989,7 @@ out:
 			error = 0;
 	}
 	vrele(tond.ni_startdir);
-	FREE(tond.ni_cnd.cn_pnbuf, M_NAMEI);
+	zfree(namei_zone, tond.ni_cnd.cn_pnbuf);
 out1:
 	if (fdirp) {
 		fdiraft_ret = VOP_GETATTR(fdirp, &fdiraft, cred, procp);
@@ -2000,7 +2000,7 @@ out1:
 		vrele(tdirp);
 	}
 	vrele(fromnd.ni_startdir);
-	FREE(fromnd.ni_cnd.cn_pnbuf, M_NAMEI);
+	zfree(namei_zone, fromnd.ni_cnd.cn_pnbuf);
 	nfsm_reply(2 * NFSX_WCCDATA(v3));
 	if (v3) {
 		nfsm_srvwcc_data(fdirfor_ret, &fdirfor, fdiraft_ret, &fdiraft);
@@ -2015,11 +2015,11 @@ nfsmout:
 		vrele(tdirp);
 	if (tond.ni_cnd.cn_nameiop) {
 		vrele(tond.ni_startdir);
-		FREE(tond.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, tond.ni_cnd.cn_pnbuf);
 	}
 	if (fromnd.ni_cnd.cn_nameiop) {
 		vrele(fromnd.ni_startdir);
-		FREE(fromnd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, fromnd.ni_cnd.cn_pnbuf);
 		VOP_ABORTOP(fromnd.ni_dvp, &fromnd.ni_cnd);
 		vrele(fromnd.ni_dvp);
 		vrele(fvp);
@@ -2199,7 +2199,7 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 	*(pathcp + len2) = '\0';
 	if (nd.ni_vp) {
 		vrele(nd.ni_startdir);
-		free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+		zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 		if (nd.ni_dvp == nd.ni_vp)
 			vrele(nd.ni_dvp);
@@ -2232,7 +2232,7 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 		}
 	    } else
 		vrele(nd.ni_startdir);
-	    FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+	    zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	}
 out:
 	if (pathcp)
@@ -2253,7 +2253,7 @@ out:
 nfsmout:
 	if (nd.ni_cnd.cn_nameiop) {
 		vrele(nd.ni_startdir);
-		free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
+	        zfree(namei_zone, nd.ni_cnd.cn_pnbuf);
 	}
 	if (dirp)
 		vrele(dirp);