]> git.itanic.dy.fi Git - linux-stable/commitdiff
null_blk: use the default discard granularity
authorChristoph Hellwig <hch@lst.de>
Thu, 28 Dec 2023 07:55:42 +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>
Link: https://lore.kernel.org/r/20231228075545.362768-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/null_blk/main.c

index 13ed446b5e198e58a20be956e358c4560ba41897..9f7695f00c2db8494a0230f2337a64d2fb4d3a14 100644 (file)
@@ -1880,7 +1880,6 @@ static void null_config_discard(struct nullb *nullb)
                return;
        }
 
-       nullb->q->limits.discard_granularity = nullb->dev->blocksize;
        blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);
 }