summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Martelletto <pedro@cvs.openbsd.org>2004-06-01 21:58:20 +0000
committerPedro Martelletto <pedro@cvs.openbsd.org>2004-06-01 21:58:20 +0000
commit95373af65d68edce2fe7b0870bb26d63f82de152 (patch)
treeef11088d40793781849aa6bacc63cd6052c6d86f
parent20b1bfb2a10edf5971e46a6d6f254b6889de8197 (diff)
use M_MISCFSMNT to allocate nullfs memory, ok tedu@
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 2c091f9b721..dd301479eea 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: null_vfsops.c,v 1.21 2004/05/20 18:32:37 tedu Exp $ */
+/* $OpenBSD: null_vfsops.c,v 1.22 2004/06/01 21:58:19 pedro Exp $ */
/* $NetBSD: null_vfsops.c,v 1.38 2002/09/21 18:09:29 christos Exp $ */
/*
@@ -158,7 +158,7 @@ nullfs_mount(mp, path, data, ndp, p)
* First cut at fixing up upper mount point
*/
nmp = (struct null_mount *) malloc(sizeof(struct null_mount),
- M_UFSMNT, M_WAITOK); /* XXX */
+ M_MISCFSMNT, M_WAITOK);
memset(nmp, 0, sizeof(struct null_mount));
mp->mnt_data = nmp;
@@ -191,7 +191,7 @@ nullfs_mount(mp, path, data, ndp, p)
if (error) {
vput(lowerrootvp);
free(nmp->nullm_node_hashtbl, M_CACHE);
- free(nmp, M_UFSMNT);
+ free(nmp, M_MISCFSMNT);
return (error);
}
/*
@@ -273,7 +273,7 @@ nullfs_unmount(mp, mntflags, p)
free(nmp->nullm_node_hashtbl, M_CACHE);
free(mp->mnt_data, M_MISCFSMNT);
mp->mnt_data = NULL;
- return 0;
+ return (0);
}
extern const struct vnodeopv_desc nullfs_vnodeop_opv_desc;