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

Commit 07ce213f authored by Josef Bacik's avatar Josef Bacik Committed by Jens Axboe
Browse files

nbd: set discard_alignment to the granularity 



Technically we should be able to get away with 0 as the
discard_alignment, but there's no way currently for the protocol to
indicate different alignments, and in real life most disks have
discard_alignment == discard_granularity.  Just set our alignment to our
blocksize to make sure discards will actually work properly with 4k
drives.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ee57a05c

drivers/block/nbd.c

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ static void nbd_size_update(struct nbd_device *nbd) 


	if (config->flags & NBD_FLAG_SEND_TRIM) {

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

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

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

	}

	blk_queue_logical_block_size(nbd->disk->queue, config->blksize);
@@ -1062,6 +1063,7 @@ static void nbd_config_put(struct nbd_device *nbd) 


		nbd->tag_set.timeout = 0;

		nbd->disk->queue->limits.discard_granularity = 0;

		nbd->disk->queue->limits.discard_alignment = 0;

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

		blk_queue_flag_clear(QUEUE_FLAG_DISCARD, nbd->disk->queue);
@@ -1516,6 +1518,7 @@ 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 = 0;

	disk->queue->limits.discard_alignment = 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);