Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932953AbcDKN3s (ORCPT ); Mon, 11 Apr 2016 09:29:48 -0400 Received: from mx2.suse.de ([195.135.220.15]:37755 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932556AbcDKNYW (ORCPT ); Mon, 11 Apr 2016 09:24:22 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jes Sorensen , Shaohua Li , Jiri Slaby Subject: [PATCH 3.12 81/98] md/raid5: Compare apples to apples (or sectors to sectors) Date: Mon, 11 Apr 2016 15:23:23 +0200 Message-Id: <6302ce9598c13ad114eec41b02c2eb39ce24663d.1460380917.git.jslaby@suse.cz> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1285 Lines: 39 From: Jes Sorensen 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit e7597e69dec59b65c5525db1626b9d34afdfa678 upstream. '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") Signed-off-by: Jes Sorensen Signed-off-by: Shaohua Li Signed-off-by: Jiri Slaby --- drivers/md/raid5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4881851c4b42..9fbc77c6e132 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5985,8 +5985,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 -- 2.8.1