diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
| commit | 1ede983cc905643549d8cae56a9d0e28fc68375f (patch) | |
| tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/fs/pseudofs | |
| parent | 994f9863852fe65833509090659d9f5aef7194d3 (diff) | |
Notes
Diffstat (limited to 'sys/fs/pseudofs')
| -rw-r--r-- | sys/fs/pseudofs/pseudofs.c | 4 | ||||
| -rw-r--r-- | sys/fs/pseudofs/pseudofs_vncache.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index eb2d67de9bf1d..f7a042603c0b1 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -71,7 +71,7 @@ pfs_alloc_node(struct pfs_info *pi, const char *name, pfs_type_t type) KASSERT(strlen(name) < PFS_NAMELEN, ("%s(): node name is too long", __func__)); - MALLOC(pn, struct pfs_node *, sizeof *pn, + pn = malloc(sizeof *pn, M_PFSNODES, M_WAITOK|M_ZERO); mtx_init(&pn->pn_mutex, "pfs_node", NULL, MTX_DEF | MTX_DUPOK); strlcpy(pn->pn_name, name, sizeof pn->pn_name); @@ -290,7 +290,7 @@ pfs_destroy(struct pfs_node *pn) /* destroy the node */ pfs_fileno_free(pn); mtx_destroy(&pn->pn_mutex); - FREE(pn, M_PFSNODES); + free(pn, M_PFSNODES); return (0); } diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c index 2e8040fa6df96..eac35ebe58b16 100644 --- a/sys/fs/pseudofs/pseudofs_vncache.c +++ b/sys/fs/pseudofs/pseudofs_vncache.c @@ -149,7 +149,7 @@ retry: ++pfs_vncache_misses; /* nope, get a new one */ - MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); + pvd = malloc(sizeof *pvd, M_PFSVNCACHE, M_WAITOK); mtx_lock(&pfs_vncache_mutex); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; @@ -159,7 +159,7 @@ retry: mtx_lock(&pfs_vncache_mutex); --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); return (error); } pvd->pvd_pn = pn; @@ -203,7 +203,7 @@ retry: mtx_lock(&pfs_vncache_mutex); --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); *vpp = NULLVP; return (error); } @@ -237,7 +237,7 @@ pfs_vncache_free(struct vnode *vp) --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); vp->v_data = NULL; return (0); } |