Commit 6105d1fe authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Michael S. Tsirkin
Browse files

virtio-blk: remove unneeded "likely" statements 



Usually we use "likely/unlikely" to optimize the fast path. Remove
redundant "likely/unlikely" statements in the control path to simplify
the code and make it easier to read.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Link: https://lore.kernel.org/r/20210905085717.7427-1-mgurtovoy@nvidia.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarChaitanya Kulkarni <ckulkarnilinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 81a83d7f

drivers/block/virtio_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int virtblk_probe(struct virtio_device *vdev) 
		goto out_free_vblk;



	/* Default queue sizing is to fill the ring. */

	if (likely(!virtblk_queue_depth)) {

	if (!virtblk_queue_depth) {

		queue_depth = vblk->vqs[0].vq->num_free;

		/* ... but without indirect descs, we use 2 descs per req */

		if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC))
@@ -839,7 +839,7 @@ static int virtblk_probe(struct virtio_device *vdev) 
	else

		blk_size = queue_logical_block_size(q);



	if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) {

	if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE) {

		dev_err(&vdev->dev,

			"block size is changed unexpectedly, now is %u\n",

			blk_size);