aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target/iscsi/iscsi_target_erl2.c
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2011-10-08 16:59:52 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2011-10-23 23:20:39 -0400
commit39c05f321a4b27f3036392eed68bd94ce2267155 (patch)
tree28f5db67b1ac89444428cc03d043481b51fbac71 /drivers/target/iscsi/iscsi_target_erl2.c
parent82f1c8a4e7739eae9f1c32c2c419efdc19b8af41 (diff)
target: Remove session_reinstatement parameter from ->transport_wait_for_tasks
This patch removes the unnecessary session_reinstatement parameter from se_cmd->transport_wait_for_tasks(), logic in transport_generic_wait_for_tasks, and usage within iscsi-target code. This also includes the removal of the 'bool' return from transport_put_cmd() + transport_generic_free_cmd() that is no longer necessary. Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_erl2.c')
-rw-r--r--drivers/target/iscsi/iscsi_target_erl2.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c
index 91a4d170bda4..000356baf0b5 100644
--- a/drivers/target/iscsi/iscsi_target_erl2.c
+++ b/drivers/target/iscsi/iscsi_target_erl2.c
@@ -148,7 +148,7 @@ void iscsit_free_connection_recovery_entires(struct iscsi_session *sess)
148 iscsit_release_cmd(cmd); 148 iscsit_release_cmd(cmd);
149 else 149 else
150 cmd->se_cmd.transport_wait_for_tasks( 150 cmd->se_cmd.transport_wait_for_tasks(
151 &cmd->se_cmd, 1, 1); 151 &cmd->se_cmd, 1);
152 spin_lock(&cr->conn_recovery_cmd_lock); 152 spin_lock(&cr->conn_recovery_cmd_lock);
153 } 153 }
154 spin_unlock(&cr->conn_recovery_cmd_lock); 154 spin_unlock(&cr->conn_recovery_cmd_lock);
@@ -175,7 +175,7 @@ void iscsit_free_connection_recovery_entires(struct iscsi_session *sess)
175 iscsit_release_cmd(cmd); 175 iscsit_release_cmd(cmd);
176 else 176 else
177 cmd->se_cmd.transport_wait_for_tasks( 177 cmd->se_cmd.transport_wait_for_tasks(
178 &cmd->se_cmd, 1, 1); 178 &cmd->se_cmd, 1);
179 spin_lock(&cr->conn_recovery_cmd_lock); 179 spin_lock(&cr->conn_recovery_cmd_lock);
180 } 180 }
181 spin_unlock(&cr->conn_recovery_cmd_lock); 181 spin_unlock(&cr->conn_recovery_cmd_lock);
@@ -265,7 +265,7 @@ void iscsit_discard_cr_cmds_by_expstatsn(
265 iscsit_release_cmd(cmd); 265 iscsit_release_cmd(cmd);
266 else 266 else
267 cmd->se_cmd.transport_wait_for_tasks( 267 cmd->se_cmd.transport_wait_for_tasks(
268 &cmd->se_cmd, 1, 0); 268 &cmd->se_cmd, 1);
269 spin_lock(&cr->conn_recovery_cmd_lock); 269 spin_lock(&cr->conn_recovery_cmd_lock);
270 } 270 }
271 spin_unlock(&cr->conn_recovery_cmd_lock); 271 spin_unlock(&cr->conn_recovery_cmd_lock);
@@ -324,7 +324,7 @@ int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn)
324 iscsit_release_cmd(cmd); 324 iscsit_release_cmd(cmd);
325 else 325 else
326 cmd->se_cmd.transport_wait_for_tasks( 326 cmd->se_cmd.transport_wait_for_tasks(
327 &cmd->se_cmd, 1, 1); 327 &cmd->se_cmd, 1);
328 spin_lock_bh(&conn->cmd_lock); 328 spin_lock_bh(&conn->cmd_lock);
329 } 329 }
330 spin_unlock_bh(&conn->cmd_lock); 330 spin_unlock_bh(&conn->cmd_lock);
@@ -383,7 +383,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn)
383 iscsit_release_cmd(cmd); 383 iscsit_release_cmd(cmd);
384 else 384 else
385 cmd->se_cmd.transport_wait_for_tasks( 385 cmd->se_cmd.transport_wait_for_tasks(
386 &cmd->se_cmd, 1, 0); 386 &cmd->se_cmd, 1);
387 spin_lock_bh(&conn->cmd_lock); 387 spin_lock_bh(&conn->cmd_lock);
388 continue; 388 continue;
389 } 389 }
@@ -409,7 +409,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn)
409 iscsit_release_cmd(cmd); 409 iscsit_release_cmd(cmd);
410 else 410 else
411 cmd->se_cmd.transport_wait_for_tasks( 411 cmd->se_cmd.transport_wait_for_tasks(
412 &cmd->se_cmd, 1, 1); 412 &cmd->se_cmd, 1);
413 spin_lock_bh(&conn->cmd_lock); 413 spin_lock_bh(&conn->cmd_lock);
414 continue; 414 continue;
415 } 415 }
@@ -436,8 +436,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn)
436 436
437 if ((cmd->se_cmd.se_cmd_flags & SCF_SE_LUN_CMD) && 437 if ((cmd->se_cmd.se_cmd_flags & SCF_SE_LUN_CMD) &&
438 cmd->se_cmd.transport_wait_for_tasks) 438 cmd->se_cmd.transport_wait_for_tasks)
439 cmd->se_cmd.transport_wait_for_tasks(&cmd->se_cmd, 439 cmd->se_cmd.transport_wait_for_tasks(&cmd->se_cmd, 0);
440 0, 0);
441 /* 440 /*
442 * Add the struct iscsi_cmd to the connection recovery cmd list 441 * Add the struct iscsi_cmd to the connection recovery cmd list
443 */ 442 */