diff --git a/UPDATING b/UPDATING index d6ddc2082553..12476f4f7fd3 100644 --- a/UPDATING +++ b/UPDATING @@ -32,13 +32,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20180611: - A bug in dump has been found where it can incorrectly dump filesystems - with more than 512k inodes and produce corrupted dump images. r334968 - closes the door by not dumping filesystems with more than 512k inodes. - While older dumps may 'work' the image they produce may or may not be - readable depending on many factors. - 20180530: The kernel / userland interface for devinfo changed, so you'll need a new kernel and userland as a pair for it to work (rebuilding diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8 index 23f40d5d6934..5df399a17795 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -566,8 +566,3 @@ This will be fixed in a later version of .Fx . Presently, it works if you set it setuid (like it used to be), but this might constitute a security risk. -.Pp -It is not possible to safely dump filesystems that use more than -524288 inodes. -.Nm -refuses to dump any filesystem that has more than 524288 inodes. diff --git a/sbin/dump/main.c b/sbin/dump/main.c index fbe8e8f97f3a..127b5ca33f97 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -100,7 +100,7 @@ main(int argc, char *argv[]) struct fstab *dt; char *map, *mntpt; int ch, mode, mntflags; - int i, ret, anydirskipped, c_count, bflag = 0, Tflag = 0, honorlevel = 1; + int i, ret, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1; int just_estimate = 0; ino_t maxino; char *tmsg; @@ -452,9 +452,6 @@ main(int argc, char *argv[]) quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE); maxino = sblock->fs_ipg * sblock->fs_ncg; mapsize = roundup(howmany(maxino, CHAR_BIT), TP_BSIZE); - c_count = howmany(mapsize * sizeof(char), TP_BSIZE); - if (c_count > TP_NINDIR) - quit("fs is too large for dump!"); usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));