From: Karel Zak <kzak@redhat.com>
Date: Mon, 3 Dec 2012 14:50:21 +0000 (+0100)
Subject: fdisk: use BLKSSZGET as default for io-limits rather than hardcoded limit
X-Git-Tag: v2.23-rc1~462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9598acbcc8fb1faac3dec012fcdf5dd411803df4;p=thirdparty%2Futil-linux.git

fdisk: use BLKSSZGET as default for io-limits rather than hardcoded limit

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/utils.c b/fdisks/utils.c
index 311304351d..8acd19a41e 100644
--- a/fdisks/utils.c
+++ b/fdisks/utils.c
@@ -298,16 +298,16 @@ static int __discover_topology(struct fdisk_context *cxt)
 	blkid_free_probe(pr);
 #endif
 
-	/* no blkid or error, use default values */
-	if (!cxt->min_io_size)
-		cxt->min_io_size = DEFAULT_SECTOR_SIZE;
-	if (!cxt->io_size)
-		cxt->io_size = DEFAULT_SECTOR_SIZE;
-
 	cxt->sector_size = __get_sector_size(cxt->dev_fd);
 	if (!cxt->phy_sector_size) /* could not discover physical size */
 		cxt->phy_sector_size = cxt->sector_size;
 
+	/* no blkid or error, use default values */
+	if (!cxt->min_io_size)
+		cxt->min_io_size = cxt->sector_size;
+	if (!cxt->io_size)
+		cxt->io_size = cxt->sector_size;
+
 	DBG(TOPOLOGY, dbgprint("topology discovered for %s:\n"
 			       "\tlogical/physical sector sizes: %ld/%ld\n"
 			       "\tfdisk/minimal/optimal io sizes: %ld/%ld/%ld\n",