nbd: use the default discard granularity

The discard granularity now defaults to a single sector, so don't set
that value explicitly.  Also don't bother clearing it as a discard
granularity without discard_sectors doesn't mean anything.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231228075545.362768-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b6414e1e645b763f619dfcf976aefcf3851d03c8..4e72ec4e25ac5a0f41bca299e7efaecf6503c451 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -334,10 +334,8 @@ static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize,
        if (!nbd->pid)
                return 0;
 
-       if (nbd->config->flags & NBD_FLAG_SEND_TRIM) {
-               nbd->disk->queue->limits.discard_granularity = blksize;
+       if (nbd->config->flags & NBD_FLAG_SEND_TRIM)
                blk_queue_max_discard_sectors(nbd->disk->queue, UINT_MAX);
-       }
        blk_queue_logical_block_size(nbd->disk->queue, blksize);
        blk_queue_physical_block_size(nbd->disk->queue, blksize);
 
@@ -1357,7 +1355,6 @@ static void nbd_config_put(struct nbd_device *nbd)
                nbd->config = NULL;
 
                nbd->tag_set.timeout = 0;
-               nbd->disk->queue->limits.discard_granularity = 0;
                blk_queue_max_discard_sectors(nbd->disk->queue, 0);
 
                mutex_unlock(&nbd->config_lock);
@@ -1850,7 +1847,6 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
         * Tell the block layer that we are not a rotational device
         */
        blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
-       disk->queue->limits.discard_granularity = 0;
        blk_queue_max_discard_sectors(disk->queue, 0);
        blk_queue_max_segment_size(disk->queue, UINT_MAX);
        blk_queue_max_segments(disk->queue, USHRT_MAX);