Commit e7ffd7db authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

md/raid5: Compare apples to apples (or sectors to sectors)

commit e7597e69 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: 620125f2 ("MD: raid5 trim support")
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43bcbdfe
...@@ -7014,8 +7014,8 @@ static int raid5_run(struct mddev *mddev) ...@@ -7014,8 +7014,8 @@ static int raid5_run(struct mddev *mddev)
} }
if (discard_supported && if (discard_supported &&
mddev->queue->limits.max_discard_sectors >= stripe && mddev->queue->limits.max_discard_sectors >= (stripe >> 9) &&
mddev->queue->limits.discard_granularity >= stripe) mddev->queue->limits.discard_granularity >= stripe)
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
mddev->queue); mddev->queue);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment