From d45364857963966195b0c63ed07220333958e592 Mon Sep 17 00:00:00 2001
From: Dan Ehrenberg <dehrenberg@google.com>
Date: Sun, 17 Jul 2011 21:18:51 -0400
Subject: [PATCH] --- yaml --- r: 262106 b: refs/heads/master c:
 3eb08658431abd65c0fe6855d1860859c2d416f7 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/super.c | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6914524f4e1a..96a61c1b28f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7a1fee135771e6e5185642bdc17df19bbdbcc48
+refs/heads/master: 3eb08658431abd65c0fe6855d1860859c2d416f7
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 7910e61809e7..143d763729b4 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -2384,17 +2384,25 @@ static unsigned long ext4_get_stripe_size(struct ext4_sb_info *sbi)
 	unsigned long stride = le16_to_cpu(sbi->s_es->s_raid_stride);
 	unsigned long stripe_width =
 			le32_to_cpu(sbi->s_es->s_raid_stripe_width);
+	int ret;
 
 	if (sbi->s_stripe && sbi->s_stripe <= sbi->s_blocks_per_group)
-		return sbi->s_stripe;
-
-	if (stripe_width <= sbi->s_blocks_per_group)
-		return stripe_width;
+		ret = sbi->s_stripe;
+	else if (stripe_width <= sbi->s_blocks_per_group)
+		ret = stripe_width;
+	else if (stride <= sbi->s_blocks_per_group)
+		ret = stride;
+	else
+		ret = 0;
 
-	if (stride <= sbi->s_blocks_per_group)
-		return stride;
+	/*
+	 * If the stripe width is 1, this makes no sense and
+	 * we set it to 0 to turn off stripe handling code.
+	 */
+	if (ret <= 1)
+		ret = 0;
 
-	return 0;
+	return ret;
 }
 
 /* sysfs supprt */