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/smbfs | |
| 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/smbfs')
| -rw-r--r-- | sys/fs/smbfs/smbfs_node.c | 10 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 7ba7c5a..38464cd 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -229,15 +229,15 @@ loop: if (fap == NULL) return ENOENT; - MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK); + np = malloc(sizeof *np, M_SMBNODE, M_WAITOK); error = getnewvnode("smbfs", mp, &smbfs_vnodeops, &vp); if (error) { - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); return error; } error = insmntque(vp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); return (error); } vp->v_type = fap->fa_attr & SMB_FA_DIR ? VDIR : VREG; @@ -269,7 +269,7 @@ loop: continue; vput(vp); /* smb_name_free(np->n_name); - FREE(np, M_SMBNODE);*/ + free(np, M_SMBNODE);*/ goto loop; } LIST_INSERT_HEAD(nhpp, np, n_hash); @@ -335,7 +335,7 @@ smbfs_reclaim(ap) smbfs_hash_unlock(smp); if (np->n_name) smbfs_name_free(np->n_name); - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); if (dvp != NULL) { vrele(dvp); /* diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index a811e00..9e1dc16 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -179,7 +179,7 @@ smbfs_mount(struct mount *mp, struct thread *td) #ifdef SMBFS_USEZONE smp = zalloc(smbfsmount_zone); #else - MALLOC(smp, struct smbmount*, sizeof(*smp), M_SMBFSDATA, + smp = malloc(sizeof(*smp), M_SMBFSDATA, M_WAITOK|M_USE_RESERVE); #endif if (smp == NULL) { |
