Remove references to vm_zone.h and switch over to the new uma API.

4 files changed, 15 insertions, 15 deletions

diff --git a/sys/ufs/ifs/ifs_subr.c b/sys/ufs/ifs/ifs_subr.c
index dfd5cff..b2dcee2 100644
--- a/sys/ufs/ifs/ifs_subr.c
+++ b/sys/ufs/ifs/ifs_subr.c
@@ -55,7 +55,6 @@
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_zone.h>
 
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/quota.h>
diff --git a/sys/ufs/ifs/ifs_vnops.c b/sys/ufs/ifs/ifs_vnops.c
index 41e891d..0407032 100644
--- a/sys/ufs/ifs/ifs_vnops.c
+++ b/sys/ufs/ifs/ifs_vnops.c
@@ -57,7 +57,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_zone.h>
+#include <vm/uma.h>
 
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>
@@ -247,7 +247,7 @@ ifs_makeinode(mode, dvp, vpp, cnp)
 		mode |= IFREG;
 	error = UFS_VALLOC(dvp, mode, cnp->cn_cred, &tvp);
 	if (error) {
-		zfree(namei_zone, cnp->cn_pnbuf);
+		uma_zfree(namei_zone, cnp->cn_pnbuf);
 		return (error);
 	}
 	ip = VTOI(tvp);
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 137a8c6..9409165 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -45,7 +45,7 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
-#include <vm/vm_zone.h>
+#include <vm/uma.h>
 
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
@@ -87,7 +87,7 @@ static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset);
 static void ufsdirhash_init(void);
 static int ufsdirhash_recycle(int wanted);
 
-static vm_zone_t	ufsdirhash_zone;
+static uma_zone_t	ufsdirhash_zone;
 
 /* Dirhash list; recently-used entries are near the tail. */
 static TAILQ_HEAD(, dirhash) ufsdirhash_list;
@@ -182,7 +182,8 @@ ufsdirhash_build(struct inode *ip)
 	if (dh->dh_hash == NULL || dh->dh_blkfree == NULL)
 		goto fail;
 	for (i = 0; i < narrays; i++) {
-		if ((dh->dh_hash[i] = zalloc(ufsdirhash_zone)) == NULL)
+		if ((dh->dh_hash[i] = uma_zalloc(ufsdirhash_zone,
+		    M_WAITOK)) == NULL)
 			goto fail;
 		for (j = 0; j < DH_NBLKOFF; j++)
 			dh->dh_hash[i][j] = DIRHASH_EMPTY;
@@ -247,7 +248,7 @@ fail:
 	if (dh->dh_hash != NULL) {
 		for (i = 0; i < narrays; i++)
 			if (dh->dh_hash[i] != NULL)
-				zfree(ufsdirhash_zone, dh->dh_hash[i]);
+				uma_zfree(ufsdirhash_zone, dh->dh_hash[i]);
 		FREE(dh->dh_hash, M_DIRHASH);
 	}
 	if (dh->dh_blkfree != NULL)
@@ -283,7 +284,7 @@ ufsdirhash_free(struct inode *ip)
 	mem = sizeof(*dh);
 	if (dh->dh_hash != NULL) {
 		for (i = 0; i < dh->dh_narrays; i++)
-			zfree(ufsdirhash_zone, dh->dh_hash[i]);
+			uma_zfree(ufsdirhash_zone, dh->dh_hash[i]);
 		FREE(dh->dh_hash, M_DIRHASH);
 		FREE(dh->dh_blkfree, M_DIRHASH);
 		mem += dh->dh_narrays * sizeof(*dh->dh_hash) +
@@ -1033,7 +1034,7 @@ ufsdirhash_recycle(int wanted)
 		mtx_unlock(&dh->dh_mtx);
 		mtx_unlock(&ufsdirhash_mtx);
 		for (i = 0; i < narrays; i++)
-			zfree(ufsdirhash_zone, hash[i]);
+			uma_zfree(ufsdirhash_zone, hash[i]);
 		FREE(hash, M_DIRHASH);
 		FREE(blkfree, M_DIRHASH);
 
@@ -1049,8 +1050,8 @@ ufsdirhash_recycle(int wanted)
 static void
 ufsdirhash_init()
 {
-	ufsdirhash_zone = zinit("DIRHASH", DH_NBLKOFF * sizeof(daddr_t), 0,
-	    0, 1);
+	ufsdirhash_zone = uma_zcreate("DIRHASH", DH_NBLKOFF * sizeof(daddr_t),
+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	mtx_init(&ufsdirhash_mtx, "dirhash list", MTX_DEF);
 	TAILQ_INIT(&ufsdirhash_list);
 }
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index a997283..238acd8 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -57,7 +57,7 @@
 #include <sys/extattr.h>
 #include <sys/sysctl.h>
 
-#include <vm/vm_zone.h>
+#include <vm/uma.h>
 
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/extattr.h>
@@ -259,7 +259,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 		cnp.cn_flags |= LOCKPARENT;
 	cnp.cn_thread = td;
 	cnp.cn_cred = td->td_ucred;
-	cnp.cn_pnbuf = zalloc(namei_zone);
+	cnp.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
 	cnp.cn_nameptr = cnp.cn_pnbuf;
 	error = copystr(dirname, cnp.cn_pnbuf, MAXPATHLEN,
 	    (size_t *) &cnp.cn_namelen);
@@ -267,7 +267,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 		if (lockparent == UE_GETDIR_LOCKPARENT_DONT) {
 			VOP_UNLOCK(start_dvp, 0, td);
 		}
-		zfree(namei_zone, cnp.cn_pnbuf);
+		uma_zfree(namei_zone, cnp.cn_pnbuf);
 		printf("ufs_extattr_lookup: copystr failed\n");
 		return (error);
 	}
@@ -277,7 +277,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 	vargs.a_vpp = &target_vp;
 	vargs.a_cnp = &cnp;
 	error = ufs_lookup(&vargs);
-	zfree(namei_zone, cnp.cn_pnbuf);
+	uma_zfree(namei_zone, cnp.cn_pnbuf);
 	if (error) {
 		/*
 		 * Error condition, may have to release the lock on the parent