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

index 50206feac577d539e638cd18a012195f5bc91bac..92ee2697ff398458c004ce4bc7515abfc0def5d4 100644 (file)
@@ -798,7 +798,6 @@ static int ubd_open_dev(struct ubd *ubd_dev)
                ubd_dev->cow.fd = err;
        }
        if (ubd_dev->no_trim == 0) {
-               ubd_dev->queue->limits.discard_granularity = SECTOR_SIZE;
                blk_queue_max_discard_sectors(ubd_dev->queue, UBD_MAX_REQUEST);
                blk_queue_max_write_zeroes_sectors(ubd_dev->queue, UBD_MAX_REQUEST);
        }