diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2016-02-16 22:44:24 +0100 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-02-26 01:38:53 +0100 |
| commit | e7597e69dec59b65c5525db1626b9d34afdfa678 (patch) | |
| tree | 0501d81aef5e40c425d33097fb223eead3a409c6 /drivers/md | |
| parent | Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-e7597e69dec59b65c5525db1626b9d34afdfa678.tar.xz linux-e7597e69dec59b65c5525db1626b9d34afdfa678.zip | |
md/raid5: Compare apples to apples (or sectors to sectors)
'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 <Jes.Sorensen@redhat.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index b4f02c9959f2..7f770b0c0348 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7014,8 +7014,8 @@ static int raid5_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 |