[PATCH V5 3/5] virtio-scsi: push vq lock/unlock into virtscsi_vq_done

[Wanlong Gao]

From: Paolo Bonzini <pbonz...@redhat.com>

Avoid duplicated code in all of the callers.

Cc: linux-s...@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Wanlong Gao <gaowanl...@cn.fujitsu.com>
Reviewed-by: Asias He <as...@redhat.com>
---
 drivers/scsi/virtio_scsi.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index bcab9d7..94a64ad 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -167,28 +167,30 @@ static void virtscsi_complete_cmd(struct virtio_scsi 
*vscsi, void *buf)
        sc->scsi_done(sc);
 }
 
-static void virtscsi_vq_done(struct virtio_scsi *vscsi, struct virtqueue *vq,
+static void virtscsi_vq_done(struct virtio_scsi *vscsi,
+                            struct virtio_scsi_vq *virtscsi_vq,
                             void (*fn)(struct virtio_scsi *vscsi, void *buf))
 {
        void *buf;
        unsigned int len;
+       unsigned long flags;
+       struct virtqueue *vq = virtscsi_vq->vq;
 
+       spin_lock_irqsave(&virtscsi_vq->vq_lock, flags);
        do {
                virtqueue_disable_cb(vq);
                while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
                        fn(vscsi, buf);
        } while (!virtqueue_enable_cb(vq));
+       spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
 }
 
 static void virtscsi_req_done(struct virtqueue *vq)
 {
        struct Scsi_Host *sh = virtio_scsi_host(vq->vdev);
        struct virtio_scsi *vscsi = shost_priv(sh);
-       unsigned long flags;
 
-       spin_lock_irqsave(&vscsi->req_vq.vq_lock, flags);
-       virtscsi_vq_done(vscsi, vq, virtscsi_complete_cmd);
-       spin_unlock_irqrestore(&vscsi->req_vq.vq_lock, flags);
+       virtscsi_vq_done(vscsi, &vscsi->req_vq, virtscsi_complete_cmd);
 };
 
 static void virtscsi_complete_free(struct virtio_scsi *vscsi, void *buf)
@@ -205,11 +207,8 @@ static void virtscsi_ctrl_done(struct virtqueue *vq)
 {
        struct Scsi_Host *sh = virtio_scsi_host(vq->vdev);
        struct virtio_scsi *vscsi = shost_priv(sh);
-       unsigned long flags;
 
-       spin_lock_irqsave(&vscsi->ctrl_vq.vq_lock, flags);
-       virtscsi_vq_done(vscsi, vq, virtscsi_complete_free);
-       spin_unlock_irqrestore(&vscsi->ctrl_vq.vq_lock, flags);
+       virtscsi_vq_done(vscsi, &vscsi->ctrl_vq, virtscsi_complete_free);
 };
 
 static int virtscsi_kick_event(struct virtio_scsi *vscsi,
@@ -344,11 +343,8 @@ static void virtscsi_event_done(struct virtqueue *vq)
 {
        struct Scsi_Host *sh = virtio_scsi_host(vq->vdev);
        struct virtio_scsi *vscsi = shost_priv(sh);
-       unsigned long flags;
 
-       spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags);
-       virtscsi_vq_done(vscsi, vq, virtscsi_complete_event);
-       spin_unlock_irqrestore(&vscsi->event_vq.vq_lock, flags);
+       virtscsi_vq_done(vscsi, &vscsi->event_vq, virtscsi_complete_event);
 };
 
 /**
-- 
1.8.2.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/