Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7597e69 authored by Jes Sorensen's avatar Jes Sorensen Committed by Shaohua Li
Browse files

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: 620125f2 ("MD: raid5 trim support")
Cc: stable@vger.kernel.org v3.7+
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 6dc390ad

drivers/md/raid5.c

+2 −2
Original line number Diff line number Diff line
@@ -7014,7 +7014,7 @@ static int raid5_run(struct mddev *mddev) 
		}



		if (discard_supported &&

		   mddev->queue->limits.max_discard_sectors >= stripe &&

		    mddev->queue->limits.max_discard_sectors >= (stripe >> 9) &&

		    mddev->queue->limits.discard_granularity >= stripe)

			queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,

						mddev->queue);