summaryrefslogtreecommitdiffstats
path: root/sys/fs/udf/udf_vnops.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/udf/udf_vnops.c')
-rw-r--r--sys/fs/udf/udf_vnops.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 26d5b18..d468890 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -574,7 +574,7 @@ udf_getfid(struct udf_dirstream *ds)
*/
if (ds->fid_fragment && ds->buf != NULL) {
ds->fid_fragment = 0;
- FREE(ds->buf, M_UDFFID);
+ free(ds->buf, M_UDFFID);
}
fid = (struct fileid_desc*)&ds->data[ds->off];
@@ -599,7 +599,7 @@ udf_getfid(struct udf_dirstream *ds)
* File ID descriptors can only be at most one
* logical sector in size.
*/
- MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID,
+ ds->buf = malloc(ds->udfmp->bsize, M_UDFFID,
M_WAITOK | M_ZERO);
bcopy(fid, ds->buf, frag_size);
@@ -668,7 +668,7 @@ udf_closedir(struct udf_dirstream *ds)
brelse(ds->bp);
if (ds->fid_fragment && ds->buf != NULL)
- FREE(ds->buf, M_UDFFID);
+ free(ds->buf, M_UDFFID);
uma_zfree(udf_zone_ds, ds);
}
@@ -701,7 +701,7 @@ udf_readdir(struct vop_readdir_args *a)
* it left off.
*/
ncookies = uio->uio_resid / 8;
- MALLOC(cookies, u_long *, sizeof(u_long) * ncookies,
+ cookies = malloc(sizeof(u_long) * ncookies,
M_TEMP, M_WAITOK);
if (cookies == NULL)
return (ENOMEM);
@@ -787,7 +787,7 @@ udf_readdir(struct vop_readdir_args *a)
if (a->a_ncookies != NULL) {
if (error)
- FREE(cookies, M_TEMP);
+ free(cookies, M_TEMP);
else {
*a->a_ncookies = uiodir.acookies;
*a->a_cookies = cookies;
@@ -1028,7 +1028,7 @@ udf_reclaim(struct vop_reclaim_args *a)
vfs_hash_remove(vp);
if (unode->fentry != NULL)
- FREE(unode->fentry, M_UDFFENTRY);
+ free(unode->fentry, M_UDFFENTRY);
uma_zfree(udf_zone_node, unode);
vp->v_data = NULL;
}
OpenPOWER on IntegriCloud