From e1a0a1e1ac1b3091aa497e4f7589c8e08ec128d7 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Wed, 10 Apr 2013 15:06:14 +0800
Subject: [PATCH] --- yaml --- r: 362495 b: refs/heads/master c:
 7ea206cf3b06704cf2bfc9c9c395094b24dc44a2 h: refs/heads/master i:   362493:
 b03de721a2564680d2cc72e36f0f5e8bc9939b9e   362491:
 06a6cfed5123f05a275a70767463c37ff1dfcbd9   362487:
 11f383a03fc42b549ca0e151f2b0429bc5d20f4a   362479:
 4b9f2f00adbc903b59a6cb8673821a2bc86f98a5   362463:
 f8a4c0ede5cba918a06750c71c7d9c6bb1c58cc1   362431:
 fa0afb619115ebcf97b2d1b026cb6de4d68edbf6   362367:
 02d906e768ca44c45e56c85d82f5936d686e0188   362239:
 dddeccd0146d36ed0a413cfcf1ea36d494bb4d0d   361983:
 631f0ec11319fc51bfee77a947d5354f238eb81a   361471:
 5fc232c44baafe1aa5b2066f003b8d240eb57e20   360447:
 3a4bf497e7a843cc50db413d30171c18d46750c0 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/vhost/tcm_vhost.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 63962c40313d..b595d4f30257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6da51c3ef07c593a410551af4cad093e2fbe755
+refs/heads/master: 7ea206cf3b06704cf2bfc9c9c395094b24dc44a2
diff --git a/trunk/drivers/vhost/tcm_vhost.c b/trunk/drivers/vhost/tcm_vhost.c
index 28c112f23830..210d59e222fc 100644
--- a/trunk/drivers/vhost/tcm_vhost.c
+++ b/trunk/drivers/vhost/tcm_vhost.c
@@ -724,7 +724,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
 				" exceeds SCSI_MAX_VARLEN_CDB_SIZE: %d\n",
 				scsi_command_size(tv_cmd->tvc_cdb),
 				TCM_VHOST_MAX_CDB_SIZE);
-			break; /* TODO */
+			goto err;
 		}
 		tv_cmd->tvc_lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF;
 
@@ -737,7 +737,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
 					data_direction == DMA_TO_DEVICE);
 			if (unlikely(ret)) {
 				vq_err(vq, "Failed to map iov to sgl\n");
-				break; /* TODO */
+				goto err;
 			}
 		}
 
@@ -758,6 +758,11 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
 	}
 
 	mutex_unlock(&vq->mutex);
+	return;
+
+err:
+	vhost_scsi_free_cmd(tv_cmd);
+	mutex_unlock(&vq->mutex);
 }
 
 static void vhost_scsi_ctl_handle_kick(struct vhost_work *work)