diff options
author | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
commit | 66f807ed8b3634dc73d9f7526c484e43f094c0ee (patch) | |
tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/fs/udf | |
parent | a779c60ce0a41cd14710a8a12cfa22955108b27a (diff) | |
download | FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.zip FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.tar.gz |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Diffstat (limited to 'sys/fs/udf')
-rw-r--r-- | sys/fs/udf/udf_vfsops.c | 17 | ||||
-rw-r--r-- | sys/fs/udf/udf_vnops.c | 12 |
2 files changed, 14 insertions, 15 deletions
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 6c0d7d0..21ab167 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -331,7 +331,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) { bo = &devvp->v_bufobj; /* XXX: should be M_WAITOK */ - MALLOC(udfmp, struct udf_mnt *, sizeof(struct udf_mnt), M_UDFMOUNT, + udfmp = malloc(sizeof(struct udf_mnt), M_UDFMOUNT, M_NOWAIT | M_ZERO); if (udfmp == NULL) { printf("Cannot allocate UDF mount struct\n"); @@ -488,7 +488,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) { bail: if (udfmp != NULL) - FREE(udfmp, M_UDFMOUNT); + free(udfmp, M_UDFMOUNT); if (bp != NULL) brelse(bp); DROP_GIANT(); @@ -530,9 +530,9 @@ udf_unmount(struct mount *mp, int mntflags, struct thread *td) vrele(udfmp->im_devvp); if (udfmp->s_table != NULL) - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); - FREE(udfmp, M_UDFMOUNT); + free(udfmp, M_UDFMOUNT); mp->mnt_data = NULL; MNT_ILOCK(mp); @@ -647,7 +647,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) return (ENOMEM); } size = UDF_FENTRY_SIZE + le32toh(fe->l_ea) + le32toh(fe->l_ad); - MALLOC(unode->fentry, struct file_entry *, size, M_UDFFENTRY, + unode->fentry = malloc(size, M_UDFFENTRY, M_NOWAIT | M_ZERO); if (unode->fentry == NULL) { printf("Cannot allocate file entry block\n"); @@ -757,8 +757,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) pms = (struct part_map_spare *)pmap; pmap += UDF_PMAP_TYPE2_SIZE; - MALLOC(udfmp->s_table, struct udf_sparing_table *, - le32toh(pms->st_size), M_UDFMOUNT, M_NOWAIT | M_ZERO); + udfmp->s_table = malloc( le32toh(pms->st_size), M_UDFMOUNT, M_NOWAIT | M_ZERO); if (udfmp->s_table == NULL) return (ENOMEM); @@ -776,7 +775,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) brelse(bp); printf("Failed to read Sparing Table at sector %d\n", le32toh(pms->st_loc[0])); - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); return (error); } bcopy(bp->b_data, udfmp->s_table, le32toh(pms->st_size)); @@ -784,7 +783,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) if (udf_checktag(&udfmp->s_table->tag, 0)) { printf("Invalid sparing table found\n"); - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); return (EINVAL); } 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; } |