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/gnu/fs/reiserfs | |
| 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/gnu/fs/reiserfs')
| -rw-r--r-- | sys/gnu/fs/reiserfs/reiserfs_inode.c | 4 | ||||
| -rw-r--r-- | sys/gnu/fs/reiserfs/reiserfs_vfsops.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/gnu/fs/reiserfs/reiserfs_inode.c b/sys/gnu/fs/reiserfs/reiserfs_inode.c index 26288c5..46edbf4 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_inode.c +++ b/sys/gnu/fs/reiserfs/reiserfs_inode.c @@ -157,7 +157,7 @@ reiserfs_reclaim(struct vop_reclaim_args *ap) vfs_hash_remove(vp); reiserfs_log(LOG_DEBUG, "free private data\n"); - FREE(vp->v_data, M_REISERFSNODE); + free(vp->v_data, M_REISERFSNODE); vp->v_data = NULL; vnode_destroy_vobject(vp); @@ -764,7 +764,7 @@ reiserfs_iget( dev = rmp->rm_dev; /* - * If this MALLOC() is performed after the getnewvnode() it might + * If this malloc() is performed after the getnewvnode() it might * block, leaving a vnode with a NULL v_data to be found by * reiserfs_sync() if a sync happens to fire right then, which * will cause a panic because reiserfs_sync() blindly dereferences diff --git a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c index 8621818..7ffac96 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c +++ b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c @@ -929,7 +929,7 @@ get_root_node(struct reiserfs_mount *rmp, struct reiserfs_node **root) /* Allocate the node structure */ reiserfs_log(LOG_DEBUG, "malloc(struct reiserfs_node)\n"); - MALLOC(ip, struct reiserfs_node *, sizeof(struct reiserfs_node), + ip = malloc(sizeof(struct reiserfs_node), M_REISERFSNODE, M_WAITOK | M_ZERO); /* Fill the structure */ |
