svn commit: r289225 - head/usr.sbin/makefs/ffs

Sean Bruno sbruno at FreeBSD.org
Tue Oct 13 17:00:16 UTC 2015


Author: sbruno
Date: Tue Oct 13 17:00:14 2015
New Revision: 289225
URL: https://svnweb.freebsd.org/changeset/base/289225

Log:
  makefs(8) leaves sblock.fs_providersize uninitialized (zero) that can be easily
  checked with dumpfs(8). This may lead to other problems, f.e. geom_label kernel
  module sanity checks do not like zero fs_old_size value and skips such UFS1
  file system while tasting (fs_old_size derives from sblock.fs_providersize).
  
  PR:	203704
  Submitted by:	eugen at grosbein.net
  Reviewed by:	marcel

Modified:
  head/usr.sbin/makefs/ffs/mkfs.c

Modified: head/usr.sbin/makefs/ffs/mkfs.c
==============================================================================
--- head/usr.sbin/makefs/ffs/mkfs.c	Tue Oct 13 16:51:12 2015	(r289224)
+++ head/usr.sbin/makefs/ffs/mkfs.c	Tue Oct 13 17:00:14 2015	(r289225)
@@ -248,7 +248,8 @@ ffs_mkfs(const char *fsys, const fsinfo_
 		exit(21);
 	}
 	sblock.fs_fsbtodb = ilog2(sblock.fs_fsize / sectorsize);
-	sblock.fs_size = fssize = dbtofsb(&sblock, fssize);
+	sblock.fs_size = sblock.fs_providersize = fssize =
+	    dbtofsb(&sblock, fssize);
 
 	if (Oflag <= 1) {
 		sblock.fs_magic = FS_UFS1_MAGIC;


More information about the svn-src-head mailing list