]> git.itanic.dy.fi Git - linux-stable/commitdiff
zram: use the default discard granularity
authorChristoph Hellwig <hch@lst.de>
Thu, 28 Dec 2023 07:55:43 +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-8-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/zram/zram_drv.c

index d77d3664ca080529e23783561d2a00c650be01b6..e1dec0483a012bfa4072d10160542f220d11af37 100644 (file)
@@ -2227,7 +2227,6 @@ static int zram_add(void)
                                        ZRAM_LOGICAL_BLOCK_SIZE);
        blk_queue_io_min(zram->disk->queue, PAGE_SIZE);
        blk_queue_io_opt(zram->disk->queue, PAGE_SIZE);
-       zram->disk->queue->limits.discard_granularity = PAGE_SIZE;
        blk_queue_max_discard_sectors(zram->disk->queue, UINT_MAX);
 
        /*