On Fri, 2011-05-27 at 12:06 -0700, Andy Grover wrote:
> We can just look and see if sess_ooo_cmdsn_list is empty or not.
>
> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
> ---
Looks fine. Committed as df75ac8dd2
Thanks,
--nab
> drivers/target/iscsi/iscsi_target_core.h | 1 -
> drivers/target/iscsi/iscsi_target_erl1.c | 2 --
> drivers/target/iscsi/iscsi_target_util.c | 3 +--
> 3 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
> index 06ffc2f..1779f07 100644
> --- a/drivers/target/iscsi/iscsi_target_core.h
> +++ b/drivers/target/iscsi/iscsi_target_core.h
> @@ -588,7 +588,6 @@ struct iscsi_conn_recovery {
> } ____cacheline_aligned;
>
> struct iscsi_session {
> - u8 cmdsn_outoforder;
> u8 initiator_vendor;
> u8 isid[6];
> enum iscsi_timer_flags_table time2retain_timer_flags;
> diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
> index b68a3b8..67f5541 100644
> --- a/drivers/target/iscsi/iscsi_target_erl1.c
> +++ b/drivers/target/iscsi/iscsi_target_erl1.c
> @@ -1083,8 +1083,6 @@ int iscsit_handle_ooo_cmdsn(
> {
> struct iscsi_ooo_cmdsn *ooo_cmdsn = NULL;
>
> - sess->cmdsn_outoforder = 1;
> -
> cmd->deferred_i_state = cmd->i_state;
> cmd->i_state = ISTATE_DEFERRED_CMD;
> cmd->cmd_flags |= ICF_OOO_CMDSN;
> diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
> index 72af978..2348ad2 100644
> --- a/drivers/target/iscsi/iscsi_target_util.c
> +++ b/drivers/target/iscsi/iscsi_target_util.c
> @@ -406,7 +406,7 @@ inline int iscsit_check_received_cmdsn(
> return CMDSN_ERROR_CANNOT_RECOVER;
> }
>
> - if (!conn->sess->cmdsn_outoforder) {
> + if (list_empty(&conn->sess->sess_ooo_cmdsn_list)) {
> if (cmdsn == conn->sess->exp_cmd_sn) {
> conn->sess->exp_cmd_sn++;
> TRACE(TRACE_CMDSN, "Received CmdSN matches ExpCmdSN,"
> @@ -472,7 +472,6 @@ inline int iscsit_check_received_cmdsn(
> }
>
> conn->sess->ooo_cmdsn_count = 0;
> - conn->sess->cmdsn_outoforder = 0;
> } else {
> conn->sess->ooo_cmdsn_count -= counter;
> TRACE(TRACE_CMDSN, "Still missing %hu CmdSN(s),"
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
