diff options
Diffstat (limited to 'sys/fs/nwfs')
| -rw-r--r-- | sys/fs/nwfs/nwfs_node.c | 10 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_vfsops.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 6082fde..29ad71c 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -169,16 +169,16 @@ rescan: * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); + np = malloc(sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); error = getnewvnode("nwfs", mp, &nwfs_vnodeops, &vp); if (error) { *vpp = NULL; - FREE(np, M_NWNODE); + free(np, M_NWNODE); return (error); } error = insmntque(vp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(np, M_NWNODE); + free(np, M_NWNODE); *vpp = NULL; return (error); } @@ -201,7 +201,7 @@ rescan: vp->v_data = NULL; np->n_vnode = NULL; vrele(vp); - FREE(np, M_NWNODE); + free(np, M_NWNODE); goto rescan; } *vpp = vp; @@ -283,7 +283,7 @@ nwfs_reclaim(ap) nmp->n_root = NULL; } vp->v_data = NULL; - FREE(np, M_NWNODE); + free(np, M_NWNODE); if (dvp) { vrele(dvp); } diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index f795b7a..a7880b6 100644 --- a/sys/fs/nwfs/nwfs_vfsops.c +++ b/sys/fs/nwfs/nwfs_vfsops.c @@ -114,7 +114,7 @@ nwfs_initnls(struct nwmount *nmp) { nmp->m.nls.u2n = ncp_defnls.u2n; return 0; } - MALLOC(pe, char *, 256 * 4, M_NWFSDATA, M_WAITOK); + pe = malloc(256 * 4, M_NWFSDATA, M_WAITOK); pc = pe; do { COPY_TABLE(nmp->m.nls.to_lower, ncp_defnls.to_lower); @@ -191,7 +191,7 @@ static int nwfs_mount(struct mount *mp, struct thread *td) ncp_conn_unlock(conn, td); /* we keep the ref */ mp->mnt_stat.f_iosize = conn->buffer_size; /* We must malloc our own mount info */ - MALLOC(nmp,struct nwmount *,sizeof(struct nwmount),M_NWFSDATA, + nmp = malloc(sizeof(struct nwmount),M_NWFSDATA, M_WAITOK | M_USE_RESERVE | M_ZERO); if (nmp == NULL) { nwfs_printf("could not alloc nwmount\n"); |
