public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Joern Engel <joern@logfs.org>
Cc: linux-kernel@vger.kernel.org,
	target-devel <target-devel@vger.kernel.org>
Subject: Re: [PATCH 2/3] target: remove unused codes from enum tcm_tmrsp_table
Date: Sat, 06 Jul 2013 17:33:47 -0700	[thread overview]
Message-ID: <1373157227.7397.74.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <1372864937-32437-3-git-send-email-joern@logfs.org>

On Wed, 2013-07-03 at 11:22 -0400, Joern Engel wrote:
> Three have been checked for but were never set.  Remove the dead code.
> Also renumbers the remaining ones to a) get rid of the holes after the
> removal and b) avoid a collision between TMR_FUNCTION_COMPLETE==0 and
> the uninitialized case.  If we failed to set a code, we should rather
> fall into the default case then return success.
> 
> Signed-off-by: Joern Engel <joern@logfs.org>
> ---

Appled to for-next.

Thanks Joern!

--nab

>  drivers/target/iscsi/iscsi_target.c |    2 --
>  drivers/target/tcm_fc/tfc_cmd.c     |    3 ---
>  include/target/target_core_base.h   |   13 +++++--------
>  3 files changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
> index 49346b3..25d5567 100644
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@ -3136,8 +3136,6 @@ static u8 iscsit_convert_tcm_tmr_rsp(struct se_tmr_req *se_tmr)
>  		return ISCSI_TMF_RSP_NO_LUN;
>  	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
>  		return ISCSI_TMF_RSP_NOT_SUPPORTED;
> -	case TMR_FUNCTION_AUTHORIZATION_FAILED:
> -		return ISCSI_TMF_RSP_AUTH_FAILED;
>  	case TMR_FUNCTION_REJECTED:
>  	default:
>  		return ISCSI_TMF_RSP_REJECTED;
> diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
> index b406f17..7b6bb72 100644
> --- a/drivers/target/tcm_fc/tfc_cmd.c
> +++ b/drivers/target/tcm_fc/tfc_cmd.c
> @@ -413,10 +413,7 @@ int ft_queue_tm_resp(struct se_cmd *se_cmd)
>  		code = FCP_TMF_REJECTED;
>  		break;
>  	case TMR_TASK_DOES_NOT_EXIST:
> -	case TMR_TASK_STILL_ALLEGIANT:
> -	case TMR_TASK_FAILOVER_NOT_SUPPORTED:
>  	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
> -	case TMR_FUNCTION_AUTHORIZATION_FAILED:
>  	default:
>  		code = FCP_TMF_FAILED;
>  		break;
> diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
> index c4af592..4e7dd74 100644
> --- a/include/target/target_core_base.h
> +++ b/include/target/target_core_base.h
> @@ -218,14 +218,11 @@ enum tcm_tmreq_table {
>  
>  /* fabric independent task management response values */
>  enum tcm_tmrsp_table {
> -	TMR_FUNCTION_COMPLETE		= 0,
> -	TMR_TASK_DOES_NOT_EXIST		= 1,
> -	TMR_LUN_DOES_NOT_EXIST		= 2,
> -	TMR_TASK_STILL_ALLEGIANT	= 3,
> -	TMR_TASK_FAILOVER_NOT_SUPPORTED	= 4,
> -	TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	= 5,
> -	TMR_FUNCTION_AUTHORIZATION_FAILED = 6,
> -	TMR_FUNCTION_REJECTED		= 255,
> +	TMR_FUNCTION_COMPLETE		= 1,
> +	TMR_TASK_DOES_NOT_EXIST		= 2,
> +	TMR_LUN_DOES_NOT_EXIST		= 3,
> +	TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	= 4,
> +	TMR_FUNCTION_REJECTED		= 5,
>  };
>  
>  /*



  reply	other threads:[~2013-07-07  0:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-03 15:22 [PATCH 0/3] target: three cleanup patches Joern Engel
2013-07-03 15:22 ` [PATCH 1/3] target: remove iscsit_find_cmd_from_itt_or_dump() Joern Engel
2013-07-07  0:52   ` Nicholas A. Bellinger
2013-07-03 15:22 ` [PATCH 2/3] target: remove unused codes from enum tcm_tmrsp_table Joern Engel
2013-07-07  0:33   ` Nicholas A. Bellinger [this message]
2013-07-03 15:22 ` [PATCH 3/3] target: make queue_tm_rsp() return void Joern Engel
2013-07-07  0:31   ` Nicholas A. Bellinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373157227.7397.74.camel@haakon3.risingtidesystems.com \
    --to=nab@linux-iscsi.org \
    --cc=joern@logfs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=target-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox