Author: mckusick
Date: Sat Mar 2 21:22:56 2019
New Revision: 344731
URL: https://svnweb.freebsd.org/changeset/base/344731
Log:
The size of the UFS soft-updates journal must be a multiple of the
filesystem block size. When a size is specified with the -S flag
to tunefs(8), round it up to the filesystem block size.
Reported by: Peter Holm
Tested by: Peter Holm
Sponsored by: Netflix
Modified:
head/sbin/tunefs/tunefs.c
Modified: head/sbin/tunefs/tunefs.c
==============================================================================
--- head/sbin/tunefs/tunefs.c Sat Mar 2 21:11:46 2019 (r344730)
+++ head/sbin/tunefs/tunefs.c Sat Mar 2 21:22:56 2019 (r344731)
@@ -971,9 +971,9 @@ journal_alloc(int64_t size)
if (size / sblock.fs_fsize > sblock.fs_fpg)
size = sblock.fs_fpg * sblock.fs_fsize;
size = MAX(SUJ_MIN, size);
- /* fsck does not support fragments in journal files. */
- size = roundup(size, sblock.fs_bsize);
}
+ /* fsck does not support fragments in journal files. */
+ size = roundup(size, sblock.fs_bsize);
resid = blocks = size / sblock.fs_bsize;
if (sblock.fs_cstotal.cs_nbfree < blocks) {
warn("Insufficient free space for %jd byte journal", size);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
