---

yaml --- r: 361967 b: refs/heads/master c: f85eda8 h: refs/heads/master i: 361965: 64aced1 361963: f9f8763 361959: 7281598 361951: 2abce6c v: v3
git-mirror · Mar 29, 2013 · 94dba14 · 94dba14
1 parent 1764120
commit 94dba14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)