Commit 1920ed61 authored by Nicholas Bellinger's avatar Nicholas Bellinger

target: Change sbc_emulate_noop to return sense_reason_t

As reported by Fengguang Wu + 0 day build team, the sense_reason_t conversion
in for-next did not catch the recent sbc_emulate_noop() addition in mainline,
producing the following build warning in auto-next:

drivers/target/target_core_sbc.c: In function ‘sbc_parse_cdb’:
drivers/target/target_core_sbc.c:555: warning: assignment from incompatible pointer type

Go ahead and remove duplicate sbc_emulate_verify(), and change VERIFY to
use sbc_emulate_noop() as well.
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 314da1aa
...@@ -134,13 +134,7 @@ int spc_get_write_same_sectors(struct se_cmd *cmd) ...@@ -134,13 +134,7 @@ int spc_get_write_same_sectors(struct se_cmd *cmd)
EXPORT_SYMBOL(spc_get_write_same_sectors); EXPORT_SYMBOL(spc_get_write_same_sectors);
static sense_reason_t static sense_reason_t
sbc_emulate_verify(struct se_cmd *cmd) sbc_emulate_noop(struct se_cmd *cmd)
{
target_complete_cmd(cmd, GOOD);
return 0;
}
static int sbc_emulate_noop(struct se_cmd *cmd)
{ {
target_complete_cmd(cmd, GOOD); target_complete_cmd(cmd, GOOD);
return 0; return 0;
...@@ -540,7 +534,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops) ...@@ -540,7 +534,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
break; break;
case VERIFY: case VERIFY:
size = 0; size = 0;
cmd->execute_cmd = sbc_emulate_verify; cmd->execute_cmd = sbc_emulate_noop;
break; break;
case REZERO_UNIT: case REZERO_UNIT:
case SEEK_6: case SEEK_6:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment