From b5a2b286b088508ef18ac2b7768c85837327371f Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Wed, 19 Nov 2003 03:29:32 +0000
Subject: undo boolshit unapproved changes the author does not even care about
 to fix

---
 sys/ufs/ffs/ffs_inode.c   | 4 ++--
 sys/ufs/ffs/ffs_softdep.c | 4 ++--
 sys/ufs/ufs/ufs_vnops.c   | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index bd0c993e9c2..6ace69141cd 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.35 2003/11/19 02:52:13 tedu Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.36 2003/11/19 03:29:31 mickey Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -482,7 +482,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 
 	bap = (daddr_t *)bp->b_data;
 	if (lastbn != -1) {
-		copy = malloc(fs->fs_bsize, M_TEMP, M_WAITOK);
+		MALLOC(copy, daddr_t *, fs->fs_bsize, M_TEMP, M_WAITOK);
 		bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->fs_bsize);
 		bzero((caddr_t)&bap[last + 1],
 		    (u_int)(NINDIR(fs) - (last + 1)) * sizeof (daddr_t));
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 2a23f42b493..6530167435a 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.47 2003/11/19 02:52:13 tedu Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.48 2003/11/19 03:29:31 mickey Exp $	*/
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
  *
@@ -3110,7 +3110,7 @@ softdep_disk_io_initiation(bp)
 			/*
 			 * Replace up-to-date version with safe version.
 			 */
-			indirdep->ir_saveddata = malloc(bp->b_bcount,
+			MALLOC(indirdep->ir_saveddata, caddr_t, bp->b_bcount,
 			    M_INDIRDEP, M_WAITOK);
 			ACQUIRE_LOCK(&lk);
 			indirdep->ir_state &= ~ATTACHED;
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index bf8ca11259e..65d1b713fd4 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.51 2003/11/19 02:46:04 tedu Exp $	*/
+/*	$OpenBSD: ufs_vnops.c,v 1.52 2003/11/19 03:29:31 mickey Exp $	*/
 /*	$NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $	*/
 
 /*
@@ -1573,7 +1573,7 @@ ufs_readdir(v)
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			aiov.iov_len = count;
-			dirbuf = malloc(count, M_TEMP, M_WAITOK);
+			MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
 			aiov.iov_base = dirbuf;
 			error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 			if (error == 0) {
@@ -1625,7 +1625,8 @@ ufs_readdir(v)
                 }
                 lost += uio->uio_offset - off;
                 uio->uio_offset = off;
-                cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK);
+                MALLOC(cookies, u_long *, 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; ) {
-- 
cgit v1.2.3