From: Jes Sorensen Date: Tue, 16 Feb 2016 21:44:24 +0000 (-0500) Subject: md/raid5: Compare apples to apples (or sectors to sectors) X-Git-Tag: v4.1.22~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5255a738ee6ecc0e479728efe5668efd64901197;p=thirdparty%2Fkernel%2Fstable.git md/raid5: Compare apples to apples (or sectors to sectors) [ Upstream commit e7597e69dec59b65c5525db1626b9d34afdfa678 ] 'max_discard_sectors' is in sectors, while 'stripe' is in bytes. This fixes the problem where DISCARD would get disabled on some larger RAID5 configurations (6 or more drives in my testing), while it worked as expected with smaller configurations. Fixes: 620125f2bf8 ("MD: raid5 trim support") Cc: stable@vger.kernel.org v3.7+ Signed-off-by: Jes Sorensen Signed-off-by: Shaohua Li Signed-off-by: Sasha Levin --- diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 0d767e31f455d..afa7fca3a21c4 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6942,8 +6942,8 @@ static int run(struct mddev *mddev) } if (discard_supported && - mddev->queue->limits.max_discard_sectors >= stripe && - mddev->queue->limits.discard_granularity >= stripe) + mddev->queue->limits.max_discard_sectors >= (stripe >> 9) && + mddev->queue->limits.discard_granularity >= stripe) queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); else