From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756083AbYLSXeR (ORCPT ); Fri, 19 Dec 2008 18:34:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751833AbYLSXd7 (ORCPT ); Fri, 19 Dec 2008 18:33:59 -0500 Received: from smtp128.sbc.mail.sp1.yahoo.com ([69.147.65.187]:20895 "HELO smtp128.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752580AbYLSXd6 (ORCPT ); Fri, 19 Dec 2008 18:33:58 -0500 X-YMail-OSG: sDl53LEVM1nfNyAZCtBcQnIez0Y1Oxj7KlW0BRnd8NQ9jsmMxJOcl8JvqwIs7roWoj9dJ16MflcSa_ZiINs42hsSoVLEbopP137_1UxwrX_DUXul.U7EwKv52LP1Wu_TXbWNvIE0qz8w3UCZvgyip_hT2gI5KTS00JSqxkODSa._HumY.MXUbLWUvrV2K4gBe.27hAT5vY5Te1nhdjkDwppvtpq0KQJUS_19hJTG7Xz1eioVu6I- X-Yahoo-Newman-Property: ymail-3 Subject: [PATCH] [LIO-Target 6/14]: Make iSCSI TMR 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:33:25 -0800 Message-Id: <1229729605.4560.112.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 48a474887409efe398f40b33127b0c5fd4cb953b Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Fri, 19 Dec 2008 14:16:54 -0800 Subject: [PATCH] [LIO-Target]: Make iSCSI TMR code use iscsi_tpg_get_node_attrib() This patch makes iSCSI TMR code use iscsi_tpg_get_node_attrib() to locate iscsi_node_attrib_t for locating ACL information about tmr_warm_reset and tmr_cold_reset. Signed-off-by: Nicholas A. Bellinger --- drivers/lio-core/iscsi_target_tmr.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/lio-core/iscsi_target_tmr.c b/drivers/lio-core/iscsi_target_tmr.c index 5fab8f1..d6cdb79 100644 --- a/drivers/lio-core/iscsi_target_tmr.c +++ b/drivers/lio-core/iscsi_target_tmr.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -236,13 +237,13 @@ extern __u8 iscsi_tmr_task_warm_reset ( iscsi_tmr_req_t *tmr_req, unsigned char *buf) { - iscsi_node_acl_t *acl = SESS(conn)->node_acl; iscsi_session_t *sess = SESS(conn); + iscsi_node_attrib_t *na = iscsi_tpg_get_node_attrib(sess); #if 0 struct iscsi_init_task_mgt_cmnd *hdr = (struct iscsi_init_task_mgt_cmnd *) buf; #endif - if (!ISCSI_NODE_ATTRIB(acl)->tmr_warm_reset) { + if (!(na->tmr_warm_reset)) { TRACE_ERROR("TMR Opcode TARGET_WARM_RESET authorization failed" " for Initiator Node: %s\n", SESS_NODE_ACL(sess)->initiatorname); @@ -265,11 +266,12 @@ extern __u8 iscsi_tmr_task_cold_reset ( unsigned char *buf) { iscsi_session_t *sess = SESS(conn); + iscsi_node_attrib_t *na = iscsi_tpg_get_node_attrib(sess); #if 0 struct iscsi_init_task_mgt_cmnd *hdr = (struct iscsi_init_task_mgt_cmnd *) buf; #endif - if (!ISCSI_NODE_ATTRIB(sess->node_acl)->tmr_cold_reset) { + if (!(na->tmr_cold_reset)) { TRACE_ERROR("TMR Opcode TARGET_COLD_RESET authorization failed" " for Initiator Node: %s\n", SESS_NODE_ACL(sess)->initiatorname); -- 1.5.4.1