From bfaf40ada2e15bc972cab4cd5452a88720e30647 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 17 Oct 2011 13:56:50 -0400 Subject: [PATCH] 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 Signed-off-by: Nicholas Bellinger --- drivers/target/target_core_transport.c | 3 --- drivers/target/tcm_fc/tfc_cmd.c | 1 - include/target/target_core_base.h | 1 - 3 files changed, 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: case TRANSPORT_COMPLETE_OK: transport_generic_complete_ok(cmd); break; - case TRANSPORT_REMOVE: - transport_put_cmd(cmd); - break; case TRANSPORT_FREE_CMD_INTR: transport_generic_free_cmd(cmd, 0); 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) if (IS_ERR(fp)) { /* XXX need to find cmd if queued */ - cmd->se_cmd.t_state = TRANSPORT_REMOVE; cmd->seq = NULL; transport_generic_free_cmd(&cmd->se_cmd, 0); 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 { TRANSPORT_ISTATE_PROCESSING = 11, TRANSPORT_ISTATE_PROCESSED = 12, TRANSPORT_KILL = 13, - TRANSPORT_REMOVE = 14, TRANSPORT_FREE = 15, TRANSPORT_NEW_CMD_MAP = 16, TRANSPORT_FREE_CMD_INTR = 17, -- 2.20.1