From 33cec7f15d8b8d632257a277aa1e5781a709e0a6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 13 Jun 2012 16:56:33 +0200 Subject: [PATCH] --- yaml --- r: 316827 b: refs/heads/master c: bce750b1633927be3eecf821f4d17975c3ba5b6a h: refs/heads/master i: 316825: fb969d158fb6a52a35dbbff37f25855805c9597a 316823: 8ea6f16ad2028bbfb1e33361d77dc126e1fb388f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/virtio_scsi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f875516a21e3..72403590ee85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 139fe45abc2234b20fd5ecbcb7ea6d3688fed5e5 +refs/heads/master: bce750b1633927be3eecf821f4d17975c3ba5b6a diff --git a/trunk/drivers/scsi/virtio_scsi.c b/trunk/drivers/scsi/virtio_scsi.c index 0ecf95e214d3..facfc90ef005 100644 --- a/trunk/drivers/scsi/virtio_scsi.c +++ b/trunk/drivers/scsi/virtio_scsi.c @@ -281,11 +281,11 @@ static int virtscsi_kick_cmd(struct virtio_scsi *vscsi, struct virtio_scsi_vq *v spin_lock(&vq->vq_lock); ret = virtqueue_add_buf(vq->vq, vscsi->sg, out_num, in_num, cmd, gfp); + spin_unlock(&vscsi->sg_lock); if (ret >= 0) ret = virtqueue_kick_prepare(vq->vq); - spin_unlock(&vq->vq_lock); - spin_unlock_irqrestore(&vscsi->sg_lock, flags); + spin_unlock_irqrestore(&vq->vq_lock, flags); if (ret > 0) virtqueue_notify(vq->vq);