From: Eric Sandeen <sandeen@sandeen.net>
Date: Fri, 15 Jan 2010 17:45:10 +0000 (-0600)
Subject: mkfs: fix mkfs sectorsize setting when blkid fails
X-Git-Tag: v3.1.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7355966f018edd0d56b47dc5d7bac7950ed49683;p=thirdparty%2Fxfsprogs-dev.git

mkfs: fix mkfs sectorsize setting when blkid fails

When trying to mkfs something that blkid doesn't grok:

# mkfs.xfs fsfile
warning: unable to probe device toplology for device fsfile
illegal sector size 0
Usage: mkfs.xfs
...

mkfs fails.   :(

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Alex Elder <aelder@sgi.com>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 9a8eff348..faaafed82 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1574,7 +1574,7 @@ main(
 		 * Unless specified manually on the command line use the
 		 * advertised sector size of the device.
 		 */
-		sectorsize = ft.sectorsize;
+		sectorsize = ft.sectorsize ? ft.sectorsize : XFS_MIN_SECTORSIZE;
 	}
 
 	if (ft.sectoralign || !ssflag) {