MALLOC/FREE -> malloc/free

ok krw@

8 files changed, 27 insertions, 30 deletions

diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index 79f8d9fb092..a78632ce518 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.38 2007/06/17 20:15:25 jasper Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.39 2007/10/29 17:06:20 chl Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -481,7 +481,7 @@ ext2fs_indirtrunc(struct inode *ip, int32_t lbn, int32_t dbn, int32_t lastbn, in
 
 	bap = (int32_t *)bp->b_data;
 	if (lastbn >= 0) {
-		MALLOC(copy, int32_t *, fs->e2fs_bsize, M_TEMP, M_WAITOK);
+		copy = malloc(fs->e2fs_bsize, M_TEMP, M_WAITOK);
 		memcpy((caddr_t)copy, (caddr_t)bap, (u_int)fs->e2fs_bsize);
 		memset((caddr_t)&bap[last + 1], 0,
 			(u_int)(NINDIR(fs) - (last + 1)) * sizeof (u_int32_t));
@@ -528,7 +528,7 @@ ext2fs_indirtrunc(struct inode *ip, int32_t lbn, int32_t dbn, int32_t lastbn, in
 	}
 
 	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_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++;
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index f19b064aa2b..d4fad5c6d21 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_vnops.c,v 1.83 2007/09/23 20:15:07 millert Exp $	*/
+/*	$OpenBSD: ufs_vnops.c,v 1.84 2007/10/29 17:06:20 chl Exp $	*/
 /*	$NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $	*/
 
 /*
@@ -1412,7 +1412,7 @@ ufs_readdir(void *v)
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			aiov.iov_len = count;
-			MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+			dirbuf = malloc(count, M_TEMP, M_WAITOK);
 			aiov.iov_base = dirbuf;
 			error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 			if (error == 0) {
@@ -1433,7 +1433,7 @@ ufs_readdir(void *v)
 				if (dp >= edp)
 					error = uiomove(dirbuf, readcnt, uio);
 			}
-			FREE(dirbuf, M_TEMP);
+			free(dirbuf, M_TEMP);
 		}
 #	else
 		error = VOP_READ(ap->a_vp, uio, 0, ap->a_cred);
@@ -1465,8 +1465,7 @@ ufs_readdir(void *v)
                 }
                 lost += uio->uio_offset - off;
                 uio->uio_offset = off;
-                MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-                    M_WAITOK);
+                cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK);
                 *ap->a_ncookies = ncookies;
                 *ap->a_cookies = cookies;
                 for (off = offstart, dp = dpstart; off < uio->uio_offset; ) {
diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c
index ba9258fd600..88404d23d8c 100644
--- a/sys/uvm/uvm_device.c
+++ b/sys/uvm/uvm_device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_device.c,v 1.27 2006/07/31 11:51:29 mickey Exp $	*/
+/*	$OpenBSD: uvm_device.c,v 1.28 2007/10/29 17:08:08 chl Exp $	*/
 /*	$NetBSD: uvm_device.c,v 1.30 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -216,8 +216,7 @@ udv_attach(arg, accessprot, off, size)
 
 		simple_unlock(&udv_lock);
 		/* NOTE: we could sleep in the following malloc() */
-		MALLOC(udv, struct uvm_device *, sizeof(*udv), M_TEMP,
-		       M_WAITOK);
+		udv = malloc(sizeof(*udv), M_TEMP, M_WAITOK);
 		simple_lock(&udv_lock);
 
 		/*
@@ -237,7 +236,7 @@ udv_attach(arg, accessprot, off, size)
 
 		if (lcv) {
 			simple_unlock(&udv_lock);
-			FREE(udv, M_TEMP);
+			free(udv, M_TEMP);
 			continue;
 		}
 
@@ -333,7 +332,7 @@ again:
 		wakeup(udv);
 	simple_unlock(&udv_lock);
 	simple_unlock(&uobj->vmobjlock);
-	FREE(udv, M_TEMP);
+	free(udv, M_TEMP);
 	UVMHIST_LOG(maphist," <- done, freed uobj=%p", uobj,0,0,0);
 }
 
diff --git a/sys/uvm/uvm_map_i.h b/sys/uvm/uvm_map_i.h
index 70dd13e2a2d..c4d1f2c4363 100644
--- a/sys/uvm/uvm_map_i.h
+++ b/sys/uvm/uvm_map_i.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map_i.h,v 1.21 2007/04/11 12:10:42 art Exp $	*/
+/*	$OpenBSD: uvm_map_i.h,v 1.22 2007/10/29 17:08:08 chl Exp $	*/
 /*	$NetBSD: uvm_map_i.h,v 1.18 2000/11/27 08:40:04 chs Exp $	*/
 
 /* 
@@ -92,7 +92,7 @@ uvm_map_create(pmap, min, max, flags)
 {
 	vm_map_t result;
 
-	MALLOC(result, vm_map_t, sizeof(struct vm_map), M_VMMAP, M_WAITOK);
+	result = malloc(sizeof(struct vm_map), M_VMMAP, M_WAITOK);
 	uvm_map_setup(result, min, max, flags);
 	result->pmap = pmap;
 	return(result);
@@ -206,7 +206,7 @@ uvm_map_deallocate(map)
 
 	uvm_unmap(map, map->min_offset, map->max_offset);
 	pmap_destroy(map->pmap);
-	FREE(map, M_VMMAP);
+	free(map, M_VMMAP);
 }
 
 #endif /* defined(UVM_MAP_INLINE) || defined(UVM_MAP) */
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index eea4bf6717c..41c843d6dfc 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_swap.c,v 1.73 2007/09/07 15:00:20 art Exp $	*/
+/*	$OpenBSD: uvm_swap.c,v 1.74 2007/10/29 17:08:08 chl Exp $	*/
 /*	$NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $	*/
 
 /*
@@ -488,7 +488,7 @@ swaplist_insert(sdp, newspp, priority)
 			LIST_INSERT_HEAD(&swap_priority, spp, spi_swappri);
 	} else {
 	  	/* we don't need a new priority structure, free it */
-		FREE(newspp, M_VMSWAP);
+		free(newspp, M_VMSWAP);
 	}
 
 	/*
diff --git a/sys/xfs/xfs_vnodeops-bsd.c b/sys/xfs/xfs_vnodeops-bsd.c
index 1a0db79e8bf..ed74d6d478d 100644
--- a/sys/xfs/xfs_vnodeops-bsd.c
+++ b/sys/xfs/xfs_vnodeops-bsd.c
@@ -595,8 +595,7 @@ xfs_readdir(struct vop_readdir_args * ap)
 	    ncookies++;
 	}
 
-	MALLOC(cookies, xfs_cookie_t *, ncookies * sizeof(xfs_cookie_t),
-	       M_TEMP, M_WAITOK);
+	cookies = malloc(ncookies * sizeof(xfs_cookie_t), M_TEMP, M_WAITOK);
 	for (dp = dp_start, cookiep = cookies;
 	     dp < dp_end;
 	     dp = (const struct dirent *)((const char *) dp + dp->d_reclen)) {