From: Jan Kara Date: Fri, 10 Feb 2017 05:56:09 +0000 (-0500) Subject: ext4: do not use stripe_width if it is not set X-Git-Tag: v4.11-rc1~147^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5469d7c3087ecaf760f54b447f11af6061b7c897;p=thirdparty%2Fkernel%2Flinux.git ext4: do not use stripe_width if it is not set Avoid using stripe_width for sbi->s_stripe value if it is not actually set. It prevents using the stride for sbi->s_stripe. Signed-off-by: Jan Kara Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 3db5b6491513d..dde14a7ac6d77 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2637,9 +2637,9 @@ static unsigned long ext4_get_stripe_size(struct ext4_sb_info *sbi) if (sbi->s_stripe && sbi->s_stripe <= sbi->s_blocks_per_group) ret = sbi->s_stripe; - else if (stripe_width <= sbi->s_blocks_per_group) + else if (stripe_width && stripe_width <= sbi->s_blocks_per_group) ret = stripe_width; - else if (stride <= sbi->s_blocks_per_group) + else if (stride && stride <= sbi->s_blocks_per_group) ret = stride; else ret = 0;