diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-11-19 03:29:32 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-11-19 03:29:32 +0000 |
| commit | b5a2b286b088508ef18ac2b7768c85837327371f (patch) | |
| tree | 5e35c12c34029709ab79fbde983a52d0eb358a81 /sys/ufs/ffs | |
| parent | 04b32d4f433fed76b21df2aaae0e203b65afcb7a (diff) | |
undo boolshit unapproved changes the author does not even care about to fix
Diffstat (limited to 'sys/ufs/ffs')
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 4 |
2 files changed, 4 insertions, 4 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; |