From 94dba142c903f0e2936b691b203a042f0b767a38 Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Thu, 28 Mar 2013 23:06:00 -0700
Subject: [PATCH] --- yaml --- r: 361967 b: refs/heads/master c:
 f85eda8d75d37a3796cee7f5a906e50e3f13d9e1 h: refs/heads/master i:   361965:
 64aced148b5897929e638ca04e16a8fc1fd2f6d3   361963:
 f9f876351a69dfc5022aed21d80beb0396afed77   361959:
 72815987b967651a12730ee7a77952fb19b810be   361951:
 2abce6c53abc7ac6e31b813e0664cec9edfb9274 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/target/target_core_transport.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f98629524d8..ddb4c4f342c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dade71050e799d8679698a6145e2ba46cdeac2a
+refs/heads/master: f85eda8d75d37a3796cee7f5a906e50e3f13d9e1
diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c
index 2030b608136d..3243ea790eab 100644
--- a/trunk/drivers/target/target_core_transport.c
+++ b/trunk/drivers/target/target_core_transport.c
@@ -1139,8 +1139,10 @@ target_setup_cmd_from_cdb(struct se_cmd *cmd, unsigned char *cdb)
 		return ret;
 
 	ret = target_check_reservation(cmd);
-	if (ret)
+	if (ret) {
+		cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT;
 		return ret;
+	}
 
 	ret = dev->transport->parse_cdb(cmd);
 	if (ret)