Commit af281722 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

virtio_blk: Don't bother validating blocksize 



The block queue limits validation does this for us now.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240708091651.177447-5-john.g.garry@oracle.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent addc3a68

drivers/block/virtio_blk.c

+1 −10
Original line number Diff line number Diff line
@@ -1289,18 +1289,9 @@ static int virtblk_read_limits(struct virtio_blk *vblk, 
	lim->max_segment_size = max_size;



	/* Host can optionally specify the block size of the device */

	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_BLK_SIZE,

	virtio_cread_feature(vdev, VIRTIO_BLK_F_BLK_SIZE,

				   struct virtio_blk_config, blk_size,

				   &lim->logical_block_size);

	if (!err) {

		err = blk_validate_block_size(lim->logical_block_size);

		if (err) {

			dev_err(&vdev->dev,

				"virtio_blk: invalid block size: 0x%x\n",

				lim->logical_block_size);

			return err;

		}

	}



	/* Use topology information if available */

	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_TOPOLOGY,