This reverts commit e8d7c33232e5fdfa761c3416539bc5b4acd12db5. Now that raid5 doesn't abuse bi_phys_segments any more, we no longer need to impose these limits. Signed-off-by: NeilBrown <neilb@xxxxxxxx> --- drivers/md/raid5.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f93e8fddbb23..c96fca2c6a98 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7100,15 +7100,6 @@ static int raid5_run(struct mddev *mddev) stripe = (stripe | (stripe-1)) + 1; mddev->queue->limits.discard_alignment = stripe; mddev->queue->limits.discard_granularity = stripe; - - /* - * We use 16-bit counter of active stripes in bi_phys_segments - * (minus one for over-loaded initialization) - */ - blk_queue_max_hw_sectors(mddev->queue, 0xfffe * STRIPE_SECTORS); - blk_queue_max_discard_sectors(mddev->queue, - 0xfffe * STRIPE_SECTORS); - /* * unaligned part of discard request will be ignored, so can't * guarantee discard_zeroes_data -- To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html