From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755798AbYLSXhF (ORCPT ); Fri, 19 Dec 2008 18:37:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752277AbYLSXgw (ORCPT ); Fri, 19 Dec 2008 18:36:52 -0500 Received: from smtp126.sbc.mail.sp1.yahoo.com ([69.147.65.185]:22893 "HELO smtp126.sbc.mail.sp1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752028AbYLSXgv (ORCPT ); Fri, 19 Dec 2008 18:36:51 -0500 X-YMail-OSG: hzCQ1b8VM1lq35biwHWibEk4lsA3FjSaNpNrNyuU4KL831GYP1E8yL8queoFn2.H4A6e7CJPGgEIgfI9PrIfdhXYmMeRw17Q18EyohTHG9pF5BUka6oR2UwUTSYfS9LB6KdLB_Bf5e7KOlkSWzu2fW9dnmgBVKrjvC2s.6ZGc7EGOkM_ocZdbzD1hh34TOCGQOww.M4AcCV4w9hr7v.Ft5vfEJuK4lwqVfvfof7S9.8llWEbO3Y- X-Yahoo-Newman-Property: ymail-3 Subject: [PATCH] [LIO-Target 11/14]: Update iscsi_target_nego.c for se_node_acl_t From: "Nicholas A. Bellinger" To: "Linux-iSCSI.org Target Dev" Cc: LKML , linux-scsi Content-Type: text/plain Date: Fri, 19 Dec 2008 15:36:22 -0800 Message-Id: <1229729782.4560.122.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 fbcdadaa1c60d76c39668cfebf8a771e6055f46c Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Fri, 19 Dec 2008 14:31:59 -0800 Subject: [PATCH] [LIO-Target]: Update iscsi_target_nego.c for se_node_acl_t In iscsi_target_check_first_request() and iscsi_target_locate_portal(), update logic to use se_node_acl_t instead of iscsi_node_acl_t. Signed-off-by: Nicholas A. Bellinger --- drivers/lio-core/iscsi_target_nego.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/lio-core/iscsi_target_nego.c b/drivers/lio-core/iscsi_target_nego.c index 554067f..a16cbbd 100644 --- a/drivers/lio-core/iscsi_target_nego.c +++ b/drivers/lio-core/iscsi_target_nego.c @@ -42,8 +42,10 @@ #include #include #include -#include #include +#include + +#include #include #include #include @@ -162,8 +164,8 @@ static int iscsi_target_check_first_request( iscsi_conn_t *conn, iscsi_login_t *login) { - iscsi_node_acl_t *acl; iscsi_param_t *param = NULL; + se_node_acl_t *se_nacl; TRACE_ENTER @@ -200,14 +202,14 @@ static int iscsi_target_check_first_request( * iscsi_node_acl_t. */ if (!login->leading_connection) { - if (!(acl = SESS(conn)->node_acl)) { - TRACE_ERROR("Unable to locate iscsi_node_acl_t\n"); + if (!(se_nacl = SESS(conn)->se_sess->se_node_acl)) { + TRACE_ERROR("Unable to locate se_node_acl_t\n"); iscsi_tx_login_rsp(conn, STAT_CLASS_INITIATOR, STAT_DETAIL_NOT_FOUND); return(-1); } - if (strcmp(param->value, acl->initiatorname)) { + if (strcmp(param->value, se_nacl->initiatorname)) { TRACE_ERROR("Incorrect InitiatorName: %s for" " this iSCSI Initiator Node.\n", param->value); @@ -682,11 +684,10 @@ static int iscsi_target_locate_portal ( if (iscsi_target_get_initial_payload(conn, login) < 0) return(-1); - if (!(tmpbuf = (char *) kmalloc(login_req->length + 1, GFP_KERNEL))) { + if (!(tmpbuf = (char *) kzalloc(login_req->length + 1, GFP_KERNEL))) { TRACE_ERROR("Unable to allocate memory for tmpbuf.\n"); return(-1); } - memset(tmpbuf, 0, login_req->length + 1); memcpy(tmpbuf, login->req_buf, login_req->length); tmpbuf[login_req->length] = '\0'; @@ -828,8 +829,8 @@ get_target: /* * Locate incoming Initiator IQN reference from Storage Node. */ - if (!(sess->node_acl = iscsi_tpg_check_initiator_node_acl( - conn->tpg, i_buf))) { + if (!(sess->se_sess->se_node_acl = core_tpg_check_initiator_node_acl( + conn->tpg->tpg_se_tpg, i_buf))) { TRACE_ERROR("iSCSI Initiator Node: %s is not authorized to" " access iSCSI target portal group: %hu.\n", i_buf, conn->tpg->tpgt); -- 1.5.4.1