]> git.itanic.dy.fi Git - linux-stable/commitdiff
mtd_blkdevs: use the default discard granularity
authorChristoph Hellwig <hch@lst.de>
Thu, 28 Dec 2023 07:55:45 +0000 (07:55 +0000)
committerJens Axboe <axboe@kernel.dk>
Fri, 29 Dec 2023 15:44:12 +0000 (08:44 -0700)
The discard granularity now defaults to a single sector, so don't set
that value explicitly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Richard Weinberger <richard@nod.at>
Link: https://lore.kernel.org/r/20231228075545.362768-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/mtd/mtd_blkdevs.c

index ff18636e08897391d48950b0338c408b438727d9..0da7b33849471af40ff26fb501ddd51901c97ef1 100644 (file)
@@ -376,10 +376,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        blk_queue_flag_set(QUEUE_FLAG_NONROT, new->rq);
        blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, new->rq);
 
-       if (tr->discard) {
+       if (tr->discard)
                blk_queue_max_discard_sectors(new->rq, UINT_MAX);
-               new->rq->limits.discard_granularity = tr->blksize;
-       }
 
        gd->queue = new->rq;