diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2007-10-29 17:06:21 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2007-10-29 17:06:21 +0000 |
| commit | 05070ba5664cd1f90f8c37b6be09b1b58199648d (patch) | |
| tree | 66d430d11d6f711ed0c713fa851b3c2d10372328 /sys/ufs/ffs | |
| parent | 734c4017eae64744046e8cac26206b788a63f91a (diff) | |
MALLOC/FREE -> malloc/free
ok krw@
Diffstat (limited to 'sys/ufs/ffs')
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index f91d87ec8e7..01c04440288 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_inode.c,v 1.50 2007/09/23 20:15:07 millert Exp $ */ +/* $OpenBSD: ffs_inode.c,v 1.51 2007/10/29 17:06:20 chl Exp $ */ /* $NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $ */ /* @@ -522,7 +522,7 @@ ffs_indirtrunc(struct inode *ip, daddr_t lbn, daddr_t dbn, daddr_t lastbn, bap1 = (int32_t *)bp->b_data; if (lastbn != -1) { - MALLOC(copy, void *, fs->fs_bsize, M_TEMP, M_WAITOK); + copy = malloc(fs->fs_bsize, M_TEMP, M_WAITOK); bcopy(bp->b_data, copy, (u_int) fs->fs_bsize); for (i = last + 1; i < NINDIR(fs); i++) @@ -579,7 +579,7 @@ ffs_indirtrunc(struct inode *ip, daddr_t lbn, daddr_t dbn, daddr_t lastbn, } } if (copy != NULL) { - FREE(copy, M_TEMP); + free(copy, M_TEMP); } else { bp->b_flags |= B_INVAL; brelse(bp); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index ec2960a9acc..a57937f56bc 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.92 2007/07/11 15:32:22 millert Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.93 2007/10/29 17:06:20 chl Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -2342,7 +2342,7 @@ check_inode_unwritten(inodedep) if (inodedep->id_state & ONWORKLIST) WORKLIST_REMOVE(&inodedep->id_list); if (inodedep->id_savedino1 != NULL) { - FREE(inodedep->id_savedino1, M_INODEDEP); + free(inodedep->id_savedino1, M_INODEDEP); inodedep->id_savedino1 = NULL; } if (free_inodedep(inodedep) == 0) { @@ -3464,8 +3464,8 @@ initiate_write_inodeblock_ufs1(inodedep, bp) panic("initiate_write_inodeblock: already doing I/O"); } FREE_LOCK(&lk); - MALLOC(inodedep->id_savedino1, struct ufs1_dinode *, - sizeof(struct ufs1_dinode), M_INODEDEP, M_WAITOK); + inodedep->id_savedino1 = malloc(sizeof(struct ufs1_dinode), + M_INODEDEP, M_WAITOK); ACQUIRE_LOCK(&lk); *inodedep->id_savedino1 = *dp; bzero((caddr_t)dp, sizeof(struct ufs1_dinode)); @@ -3606,8 +3606,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp) if ((inodedep->id_state & DEPCOMPLETE) == 0) { if (inodedep->id_savedino2 != NULL) panic("initiate_write_inodeblock_ufs2: I/O underway"); - MALLOC(inodedep->id_savedino2, struct ufs2_dinode *, - sizeof(struct ufs2_dinode), M_INODEDEP, M_WAITOK); + inodedep->id_savedino2 = malloc(sizeof(struct ufs2_dinode), + M_INODEDEP, M_WAITOK); *inodedep->id_savedino2 = *dp; bzero((caddr_t)dp, sizeof(struct ufs2_dinode)); return; @@ -4080,7 +4080,7 @@ handle_written_inodeblock(inodedep, bp) *dp1 = *inodedep->id_savedino1; else *dp2 = *inodedep->id_savedino2; - FREE(inodedep->id_savedino1, M_INODEDEP); + free(inodedep->id_savedino1, M_INODEDEP); inodedep->id_savedino1 = NULL; if ((bp->b_flags & B_DELWRI) == 0) stat_inode_bitmap++; |