diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2018-01-24 16:44:57 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2018-01-24 16:44:57 +0000 |
| commit | f9834d101a081d0d414f0ef71ac79b610acb5c33 (patch) | |
| tree | 70e086d94af29e6a5bce6cd559cffc1e5d98c4c7 /sys/ufs/ffs/ffs_snapshot.c | |
| parent | 18dffafade16edcbc7f021f53c1c34f35ac2cfa8 (diff) | |
| download | src-f9834d101a081d0d414f0ef71ac79b610acb5c33.tar.gz src-f9834d101a081d0d414f0ef71ac79b610acb5c33.zip | |
Revert r327781, r328093, r328056:
ufs|ext2fs: Revert uses of mallocarray(9).
These aren't really useful: drop them.
Variable unsigning will be brought again later.
Notes
Notes:
svn path=/head/; revision=328340
Diffstat (limited to 'sys/ufs/ffs/ffs_snapshot.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_snapshot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index c6820c9c68bc..43829e869d4c 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -648,7 +648,7 @@ loop: * keep us out of deadlock until the full one is ready. */ if (xp == NULL) { - snapblklist = mallocarray(snaplistsize, sizeof(daddr_t), + snapblklist = malloc(snaplistsize * sizeof(daddr_t), M_UFSMNT, M_WAITOK); blkp = &snapblklist[1]; *blkp++ = lblkno(fs, fs->fs_sblockloc); @@ -729,7 +729,7 @@ out1: /* * Allocate space for the full list of preallocated snapshot blocks. */ - snapblklist = mallocarray(snaplistsize, sizeof(daddr_t), + snapblklist = malloc(snaplistsize * sizeof(daddr_t), M_UFSMNT, M_WAITOK); ip->i_snapblklist = &snapblklist[1]; /* |