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

Commit 7f82b3c9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Rusty Russell
Browse files

virtio-scsi: pass struct virtio_scsi to virtqueue completion function 



This will be needed soon in order to retrieve the per-target
struct.

Cc: linux-scsi@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Reviewed-by: default avatarAsias He <asias@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 5c370194

drivers/scsi/virtio_scsi.c

+9 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void virtscsi_compute_resid(struct scsi_cmnd *sc, u32 resid) 
 *

 * Called with vq_lock held.

 */

static void virtscsi_complete_cmd(void *buf)

static void virtscsi_complete_cmd(struct virtio_scsi *vscsi, void *buf)

{

	struct virtio_scsi_cmd *cmd = buf;

	struct scsi_cmnd *sc = cmd->sc;
@@ -165,7 +165,8 @@ static void virtscsi_complete_cmd(void *buf) 
	sc->scsi_done(sc);

}



static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf))

static void virtscsi_vq_done(struct virtio_scsi *vscsi, struct virtqueue *vq,

			     void (*fn)(struct virtio_scsi *vscsi, void *buf))

{

	void *buf;

	unsigned int len;
@@ -173,7 +174,7 @@ static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf)) 
	do {

		virtqueue_disable_cb(vq);

		while ((buf = virtqueue_get_buf(vq, &len)) != NULL)

			fn(buf);

			fn(vscsi, buf);

	} while (!virtqueue_enable_cb(vq));

}
@@ -184,11 +185,11 @@ static void virtscsi_req_done(struct virtqueue *vq) 
	unsigned long flags;



	spin_lock_irqsave(&vscsi->req_vq.vq_lock, flags);

	virtscsi_vq_done(vq, virtscsi_complete_cmd);

	virtscsi_vq_done(vscsi, vq, virtscsi_complete_cmd);

	spin_unlock_irqrestore(&vscsi->req_vq.vq_lock, flags);

};



static void virtscsi_complete_free(void *buf)

static void virtscsi_complete_free(struct virtio_scsi *vscsi, void *buf)

{

	struct virtio_scsi_cmd *cmd = buf;
@@ -205,7 +206,7 @@ static void virtscsi_ctrl_done(struct virtqueue *vq) 
	unsigned long flags;



	spin_lock_irqsave(&vscsi->ctrl_vq.vq_lock, flags);

	virtscsi_vq_done(vq, virtscsi_complete_free);

	virtscsi_vq_done(vscsi, vq, virtscsi_complete_free);

	spin_unlock_irqrestore(&vscsi->ctrl_vq.vq_lock, flags);

};
@@ -329,7 +330,7 @@ static void virtscsi_handle_event(struct work_struct *work) 
	virtscsi_kick_event(vscsi, event_node);

}



static void virtscsi_complete_event(void *buf)

static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf)

{

	struct virtio_scsi_event_node *event_node = buf;
@@ -344,7 +345,7 @@ static void virtscsi_event_done(struct virtqueue *vq) 
	unsigned long flags;



	spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags);

	virtscsi_vq_done(vq, virtscsi_complete_event);

	virtscsi_vq_done(vscsi, vq, virtscsi_complete_event);

	spin_unlock_irqrestore(&vscsi->event_vq.vq_lock, flags);

};