Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6df133a1 authored by Josef Bacik's avatar Josef Bacik Committed by Jens Axboe
Browse files

nbd: set discard granularity properly 



For some reason we had discard granularity set to 512 always even when
discards were disabled.  Fix this by having the default be 0, and then
if we turn it on set the discard granularity to the blocksize.

Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 327ea4ad

drivers/block/nbd.c

+8 −2
Original line number Diff line number Diff line
@@ -236,6 +236,10 @@ static void nbd_size_update(struct nbd_device *nbd) 
	struct nbd_config *config = nbd->config;

	struct block_device *bdev = bdget_disk(nbd->disk, 0);



	if (config->flags & NBD_FLAG_SEND_TRIM) {

		nbd->disk->queue->limits.discard_granularity = config->blksize;

		blk_queue_max_discard_sectors(nbd->disk->queue, UINT_MAX);

	}

	blk_queue_logical_block_size(nbd->disk->queue, config->blksize);

	blk_queue_physical_block_size(nbd->disk->queue, config->blksize);

	set_capacity(nbd->disk, config->bytesize >> 9);
@@ -1050,6 +1054,8 @@ 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, UINT_MAX);

		blk_queue_flag_clear(QUEUE_FLAG_DISCARD, nbd->disk->queue);



		mutex_unlock(&nbd->config_lock);
@@ -1502,8 +1508,8 @@ static int nbd_dev_add(int index) 
	 */

	blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);

	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);

	disk->queue->limits.discard_granularity = 512;

	blk_queue_max_discard_sectors(disk->queue, UINT_MAX);

	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);

	blk_queue_max_hw_sectors(disk->queue, 65536);