Commit 92f93c3a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nbd: move the task_recv check into nbd_size_update 



nbd_size_update is about to acquire a few more callers, so lift the check
into the function.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ee4bf648

drivers/block/nbd.c

+7 −3
Original line number Diff line number Diff line
@@ -299,8 +299,11 @@ static void nbd_size_clear(struct nbd_device *nbd) 
static void nbd_size_update(struct nbd_device *nbd)

{

	struct nbd_config *config = nbd->config;

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

	sector_t nr_sectors = config->bytesize >> 9;

	struct block_device *bdev;



	if (!nbd->task_recv)

		return;



	if (config->flags & NBD_FLAG_SEND_TRIM) {

		nbd->disk->queue->limits.discard_granularity = config->blksize;
@@ -309,7 +312,9 @@ static void nbd_size_update(struct nbd_device *nbd) 
	}

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

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



	set_capacity(nbd->disk, nr_sectors);

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

	if (bdev) {

		if (bdev->bd_disk)

			bd_set_nr_sectors(bdev, nr_sectors);
@@ -326,7 +331,6 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize, 
	struct nbd_config *config = nbd->config;

	config->blksize = blocksize;

	config->bytesize = blocksize * nr_blocks;

	if (nbd->task_recv != NULL)

	nbd_size_update(nbd);

}