From 7977a3907e15e404ff3ea0f4eff65e2fe197301b Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Tue, 6 Nov 2012 20:59:41 -0800
Subject: [PATCH] --- yaml --- r: 344743 b: refs/heads/master c:
 1920ed61fbbbb38919edfb2427b0b1fd4e4ad8d9 h: refs/heads/master i:   344741:
 b232c17cd385189017e3466c9c043bc5ed1e947c   344739:
 3f7b4b02ab6b8416fe49230948571c5fa6f3e496   344735:
 4afc4c1126021982ffa077db8f35409b89bff471 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/target/target_core_sbc.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9020ba95c26f..ce607ba96f60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314da1aa57c3f2be8a07f3d944a541b595e8cb7d
+refs/heads/master: 1920ed61fbbbb38919edfb2427b0b1fd4e4ad8d9
diff --git a/trunk/drivers/target/target_core_sbc.c b/trunk/drivers/target/target_core_sbc.c
index 3929fa201088..b8024219cd4f 100644
--- a/trunk/drivers/target/target_core_sbc.c
+++ b/trunk/drivers/target/target_core_sbc.c
@@ -134,13 +134,7 @@ int spc_get_write_same_sectors(struct se_cmd *cmd)
 EXPORT_SYMBOL(spc_get_write_same_sectors);
 
 static sense_reason_t
-sbc_emulate_verify(struct se_cmd *cmd)
-{
-	target_complete_cmd(cmd, GOOD);
-	return 0;
-}
-
-static int sbc_emulate_noop(struct se_cmd *cmd)
+sbc_emulate_noop(struct se_cmd *cmd)
 {
 	target_complete_cmd(cmd, GOOD);
 	return 0;
@@ -540,7 +534,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
 		break;
 	case VERIFY:
 		size = 0;
-		cmd->execute_cmd = sbc_emulate_verify;
+		cmd->execute_cmd = sbc_emulate_noop;
 		break;
 	case REZERO_UNIT:
 	case SEEK_6: