Using error label for unwind in __vring_new_virtqueue. This is useful
for future refacotring.

Signed-off-by: Jason Wang <jasow...@redhat.com>
---
 drivers/virtio/virtio_ring.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 11dfa0dc8ec1..9800f1c9ce4c 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2137,10 +2137,8 @@ struct virtqueue *__vring_new_virtqueue(unsigned int 
index,
 
        vq->split.desc_state = kmalloc_array(vring.num,
                        sizeof(struct vring_desc_state_split), GFP_KERNEL);
-       if (!vq->split.desc_state) {
-               kfree(vq);
-               return NULL;
-       }
+       if (!vq->split.desc_state)
+               goto err_state;
 
        /* Put everything in free lists. */
        vq->free_head = 0;
@@ -2151,6 +2149,10 @@ struct virtqueue *__vring_new_virtqueue(unsigned int 
index,
 
        list_add_tail(&vq->vq.list, &vdev->vqs);
        return &vq->vq;
+
+err_state:
+       kfree(vq);
+       return NULL;
 }
 EXPORT_SYMBOL_GPL(__vring_new_virtqueue);
 
-- 
2.25.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to