svn commit: r344863 - stable/12/sbin/tunefs

[Kirk McKusick]

Author: mckusick
Date: Thu Mar  7 00:02:25 2019
New Revision: 344863
URL: https://svnweb.freebsd.org/changeset/base/344863

Log:
  MFC of 344731
  
  Roundup tunefs -S logsize to filesystem block size
  
  Sponsored by: Netflix

Modified:
  stable/12/sbin/tunefs/tunefs.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/tunefs/tunefs.c
==============================================================================
--- stable/12/sbin/tunefs/tunefs.c	Thu Mar  7 00:01:28 2019	(r344862)
+++ stable/12/sbin/tunefs/tunefs.c	Thu Mar  7 00:02:25 2019	(r344863)
@@ -989,9 +989,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);