From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 5 Jul 2011 00:22:19 +0000 (-0400)
Subject: mke2fs: allow setting the stride and stripe width to zero
X-Git-Tag: android-x86-6.0-r1~26^2~691^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b734a0e715ba6590624247b0866e4791f717981;p=android-x86%2Fexternal-e2fsprogs.git

mke2fs: allow setting the stride and stripe width to zero

Mke2fs previously would give an error if the user tried setting the
stride and stripe-width parameters to zero; but this is necessary to
override the stride and stripe-width settings which get automatically
set from the block device's geometry information in sysfs.  So allow
setting these parameters to zero.

Addresses-Google-Bug: #4988555

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index e28828ee..93ae4bcc 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -731,7 +731,7 @@ static void parse_extended_opts(struct ext2_super_block *param,
 				continue;
 			}
 			param->s_raid_stride = strtoul(arg, &p, 0);
-			if (*p || (param->s_raid_stride == 0)) {
+			if (*p) {
 				fprintf(stderr,
 					_("Invalid stride parameter: %s\n"),
 					arg);
@@ -746,7 +746,7 @@ static void parse_extended_opts(struct ext2_super_block *param,
 				continue;
 			}
 			param->s_raid_stripe_width = strtoul(arg, &p, 0);
-			if (*p || (param->s_raid_stripe_width == 0)) {
+			if (*p) {
 				fprintf(stderr,
 					_("Invalid stripe-width parameter: %s\n"),
 					arg);