From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756608AbYLSXfl (ORCPT ); Fri, 19 Dec 2008 18:35:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756003AbYLSXfP (ORCPT ); Fri, 19 Dec 2008 18:35:15 -0500 Received: from smtp116.sbc.mail.sp1.yahoo.com ([69.147.64.89]:24012 "HELO smtp116.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755882AbYLSXfN (ORCPT ); Fri, 19 Dec 2008 18:35:13 -0500 X-YMail-OSG: pdVPDtcVM1mMgjdhRBuRxSZAljnFQm2p4WcWZKg3JixBBwHooSPMYpqKmHJjHHkWp92Sa2srUBlncqiq.xBYSqv6SNlNDMFTiJWqjSn.A8iS3RXhrBqvzHuETVLHiAEFsRfv.L6TrsuztBAns3.lKIpFee3L2JUazkokwrGLIjg9_eCdjwOfXHqUwDSPTbtl3UPdBkfq5_aYR4gcZAFbJ6ntHeJm5c0xS9bNS0gfXQcQUXmtCQ0- X-Yahoo-Newman-Property: ymail-3 Subject: [PATCH] [LIO-Target 8/14]: Make ErrorRecoveryLevel=1 code use iscsi_tpg_get_node_attrib() From: "Nicholas A. Bellinger" To: "Linux-iSCSI.org Target Dev" Cc: LKML , linux-scsi Content-Type: text/plain Date: Fri, 19 Dec 2008 15:34:36 -0800 Message-Id: <1229729676.4560.116.camel@haakon2.linux-iscsi.org> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 1aecef1154d178049c63ff2b63f69591a90b35ac Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Fri, 19 Dec 2008 14:22:26 -0800 Subject: [PATCH] [LIO-Target]: Make ErrorRecoveryLevel=1 code use iscsi_tpg_get_node_attrib() This patch gets rid of iscsi_node_acl_t usage in ERL=1 code and locates iscsi_node_attrib_t for DATAOUT timer settings via iscsi_tpg_get_node_attrib(). Signed-off-by: Nicholas A. Bellinger --- drivers/lio-core/iscsi_target_erl1.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/lio-core/iscsi_target_erl1.c b/drivers/lio-core/iscsi_target_erl1.c index 718b9e7..c95ece0 100644 --- a/drivers/lio-core/iscsi_target_erl1.c +++ b/drivers/lio-core/iscsi_target_erl1.c @@ -46,11 +46,13 @@ #include #include #include -#include + #include +#include +#include #include #include -#include +#include #include #include #include @@ -1277,7 +1279,7 @@ static void iscsi_handle_dataout_timeout ( iscsi_cmd_t *cmd = (iscsi_cmd_t *) data; iscsi_conn_t *conn = conn = CONN(cmd); iscsi_session_t *sess = NULL; - iscsi_node_acl_t *acl = NULL; + iscsi_node_attrib_t *na; iscsi_inc_conn_usage_count(conn); @@ -1289,7 +1291,7 @@ static void iscsi_handle_dataout_timeout ( } cmd->dataout_timer_flags &= ~DATAOUT_TF_RUNNING; sess = SESS(conn); - acl = sess->node_acl; + na = iscsi_tpg_get_node_attrib(sess); if (!SESS_OPS(sess)->ErrorRecoveryLevel) { TRACE(TRACE_ERL0, "Unable to recover from DataOut timeout while" @@ -1297,12 +1299,10 @@ static void iscsi_handle_dataout_timeout ( goto failure; } - if (++cmd->dataout_timeout_retries == - ISCSI_NODE_ATTRIB(acl)->dataout_timeout_retries) { + if (++cmd->dataout_timeout_retries == na->dataout_timeout_retries) { TRACE(TRACE_TIMER, "Command ITT: 0x%08x exceeded max retries for" " DataOUT timeout %u, closing iSCSI connection.\n", - cmd->init_task_tag, - ISCSI_NODE_ATTRIB(acl)->dataout_timeout_retries); + cmd->init_task_tag, na->dataout_timeout_retries); goto failure; } @@ -1363,7 +1363,7 @@ extern void iscsi_mod_dataout_timer (iscsi_cmd_t *cmd) { iscsi_conn_t *conn = CONN(cmd); iscsi_session_t *sess = SESS(conn); - iscsi_node_acl_t *acl = sess->node_acl; + iscsi_node_attrib_t *na = na = iscsi_tpg_get_node_attrib(sess); spin_lock_bh(&cmd->dataout_timeout_lock); if (!(cmd->dataout_timer_flags & DATAOUT_TF_RUNNING)) { @@ -1371,7 +1371,7 @@ extern void iscsi_mod_dataout_timer (iscsi_cmd_t *cmd) return; } - MOD_TIMER(&cmd->dataout_timer, ISCSI_NODE_ATTRIB(acl)->dataout_timeout); + MOD_TIMER(&cmd->dataout_timer, na->dataout_timeout); TRACE(TRACE_TIMER, "Updated DataOUT timer for ITT: 0x%08x", cmd->init_task_tag); spin_unlock_bh(&cmd->dataout_timeout_lock); @@ -1388,7 +1388,7 @@ extern void iscsi_start_dataout_timer ( iscsi_conn_t *conn) { iscsi_session_t *sess = SESS(conn); - iscsi_node_acl_t *acl = sess->node_acl; + iscsi_node_attrib_t *na = na = iscsi_tpg_get_node_attrib(sess); if (cmd->dataout_timer_flags & DATAOUT_TF_RUNNING) return; @@ -1397,8 +1397,8 @@ extern void iscsi_start_dataout_timer ( " CID: %hu.\n", cmd->init_task_tag, conn->cid); init_timer(&cmd->dataout_timer); - SETUP_TIMER(cmd->dataout_timer, ISCSI_NODE_ATTRIB(acl)->dataout_timeout, - cmd, iscsi_handle_dataout_timeout); + SETUP_TIMER(cmd->dataout_timer, na->dataout_timeout, cmd, + iscsi_handle_dataout_timeout); cmd->dataout_timer_flags &= ~DATAOUT_TF_STOP; cmd->dataout_timer_flags |= DATAOUT_TF_RUNNING; add_timer(&cmd->dataout_timer); -- 1.5.4.1