aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-10-17 13:56:50 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2011-10-23 23:21:47 -0400
commitbfaf40ada2e15bc972cab4cd5452a88720e30647 (patch)
tree23f64315f802c1e81b14a80988e1f192813c1133
parent4499dda85890e6726def812febaab5dc064cc920 (diff)
target: remove the TRANSPORT_REMOVE state
We never queue an command with this state, and only set it in a completely bogus place in tcm_fc. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/target_core_transport.c3
-rw-r--r--drivers/target/tcm_fc/tfc_cmd.c1
-rw-r--r--include/target/target_core_base.h1
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 53d332c87dcf..0d055f08044e 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -4787,9 +4787,6 @@ get_cmd:
4787 case TRANSPORT_COMPLETE_OK: 4787 case TRANSPORT_COMPLETE_OK:
4788 transport_generic_complete_ok(cmd); 4788 transport_generic_complete_ok(cmd);
4789 break; 4789 break;
4790 case TRANSPORT_REMOVE:
4791 transport_put_cmd(cmd);
4792 break;
4793 case TRANSPORT_FREE_CMD_INTR: 4790 case TRANSPORT_FREE_CMD_INTR:
4794 transport_generic_free_cmd(cmd, 0); 4791 transport_generic_free_cmd(cmd, 0);
4795 break; 4792 break;
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 55a278ed1111..6195026cc7b0 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -267,7 +267,6 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
267 267
268 if (IS_ERR(fp)) { 268 if (IS_ERR(fp)) {
269 /* XXX need to find cmd if queued */ 269 /* XXX need to find cmd if queued */
270 cmd->se_cmd.t_state = TRANSPORT_REMOVE;
271 cmd->seq = NULL; 270 cmd->seq = NULL;
272 transport_generic_free_cmd(&cmd->se_cmd, 0); 271 transport_generic_free_cmd(&cmd->se_cmd, 0);
273 return; 272 return;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 027193650749..ced065c1428d 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -95,7 +95,6 @@ enum transport_state_table {
95 TRANSPORT_ISTATE_PROCESSING = 11, 95 TRANSPORT_ISTATE_PROCESSING = 11,
96 TRANSPORT_ISTATE_PROCESSED = 12, 96 TRANSPORT_ISTATE_PROCESSED = 12,
97 TRANSPORT_KILL = 13, 97 TRANSPORT_KILL = 13,
98 TRANSPORT_REMOVE = 14,
99 TRANSPORT_FREE = 15, 98 TRANSPORT_FREE = 15,
100 TRANSPORT_NEW_CMD_MAP = 16, 99 TRANSPORT_NEW_CMD_MAP = 16,
101 TRANSPORT_FREE_CMD_INTR = 17, 100 TRANSPORT_FREE_CMD_INTR = 17,