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

Commit c2912ca3 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

nbd: Use set_blocksize() to set device blocksize



commit c8a83a6b54d0ca078de036aafb3f6af58c1dc5eb upstream.

NBD can update block device block size implicitely through
bd_set_size(). Make it explicitely set blocksize with set_blocksize() as
this behavior of bd_set_size() is going away.

CC: Josef Bacik <jbacik@fb.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4381a948
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -275,9 +275,10 @@ static void nbd_size_update(struct nbd_device *nbd)
	blk_queue_physical_block_size(nbd->disk->queue, config->blksize);
	set_capacity(nbd->disk, config->bytesize >> 9);
	if (bdev) {
		if (bdev->bd_disk)
		if (bdev->bd_disk) {
			bd_set_size(bdev, config->bytesize);
		else
			set_blocksize(bdev, config->blksize);
		} else
			bdev->bd_invalidated = 1;
		bdput(bdev);
	}