iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi-target: simplify return statement

Browse Source 
The return statement cannot be reached without either recovery or dump
being set to 1.  Therefore the condition always evaluates to true and
recovery and dump are useless variables.

Found by Coverity.

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Joern Engel 2014-09-02 17:49:51 -04:00 committed by Nicholas Bellinger
parent cb35484231
commit 5c22e22941
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/target/iscsi/iscsi_target_erl0.c
View File

@ -345,7 +345,6 @@ static int iscsit_dataout_check_datasn(
struct iscsi_cmd *cmd, struct iscsi_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
int dump = 0, recovery = 0;
u32 data_sn = 0; u32 data_sn = 0;
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct iscsi_data *hdr = (struct iscsi_data *) buf; struct iscsi_data *hdr = (struct iscsi_data *) buf;
@ -370,13 +369,11 @@ static int iscsit_dataout_check_datasn(
pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x" pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x"
" higher than expected 0x%08x.\n", cmd->init_task_tag, " higher than expected 0x%08x.\n", cmd->init_task_tag,
be32_to_cpu(hdr->datasn), data_sn); be32_to_cpu(hdr->datasn), data_sn);
recovery = 1;
goto recover; goto recover;
} else if (be32_to_cpu(hdr->datasn) < data_sn) { } else if (be32_to_cpu(hdr->datasn) < data_sn) {
pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x" pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x"
" lower than expected 0x%08x, discarding payload.\n", " lower than expected 0x%08x, discarding payload.\n",
cmd->init_task_tag, be32_to_cpu(hdr->datasn), data_sn); cmd->init_task_tag, be32_to_cpu(hdr->datasn), data_sn);
dump = 1;
goto dump; goto dump;
} }
@ -392,8 +389,7 @@ dump:
if (iscsit_dump_data_payload(conn, payload_length, 1) < 0) if (iscsit_dump_data_payload(conn, payload_length, 1) < 0)
return DATAOUT_CANNOT_RECOVER; return DATAOUT_CANNOT_RECOVER;
return (recovery || dump) ? DATAOUT_WITHIN_COMMAND_RECOVERY : return DATAOUT_WITHIN_COMMAND_RECOVERY;
DATAOUT_NORMAL;
} }
static int iscsit_dataout_pre_datapduinorder_yes( static int iscsit_dataout_pre_datapduinorder_yes(