Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp996243pxb; Wed, 1 Sep 2021 14:50:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrrToySwwdW0AzQoOKCbDXloJBu6kPuMTBojtM6O1PcdorG8S4zsZ285BMOr3/JceI74AY X-Received: by 2002:a17:906:ce3a:: with SMTP id sd26mr1775309ejb.227.1630533016637; Wed, 01 Sep 2021 14:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630533016; cv=none; d=google.com; s=arc-20160816; b=CZFFy429SBzqHX+AOaIQJrOaJyvbkc0Iphh5g7khMrtRzg7e3I/dkD9WrfAzn1IWGP 3xUY/WCoiMV30/Lf5d4+xKgtpgfWyBGgcqn/72X/ntWyC9rOgunLdVSYETnQpmJ3wNUE RjIWO7tMZ8rH0Yg5ePC9ue2Xnk3VAS6qelJTcOk0vP/DWVZE7phn+whu6WBkx09Q0dnF CnFT4yjMGPVr3DPrJ1r2xtz2EGhdSpBDVTJfQjjCOe2ofpPNhhtPqvLaEbeYJ/21mVsy iy3JS4pRtJv7sQ0SIsIp5sikdQLIJOr0a4caM4kESG1vjLyoIT2VwRVrEnBAx+m+AaBC VgKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=h9wwEvLCnhkI25JONjZYaYGQ1H/QGH2n3Om6LX53TFU=; b=OGNWBi0u6Jzjpyrp3rtHels2iDOA/CjK2eSsvpft/Ya4IVuvdggRLH9i993H5CpJ8a 7maXWvbxSy6megP/egHav4Z7SD0g4FJ/zh72iBor97MBXZShEAMz7dsCdvOWjN8nesfs rHz3gRhc94eaokn0D1PcKyrkJoVWW+Qf9j4Il8HtU6KyAgxZu9BOpOiVFJn/RslQmTms txsBioSgzOZl9dqXQda6ZEfEcdKkq2pMCkUW6srOmq82I5V54lOr7nYZgFpSKSlcsIn0 6GyoA85k8xNXvrYWZJf6nRcWwsgSqYzSSepL5xm8kO7ED1TrTKfmhOUDDbSRieg+wXJI 79Gg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u2si137edy.66.2021.09.01.14.49.53; Wed, 01 Sep 2021 14:50:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243290AbhIAIoX (ORCPT + 99 others); Wed, 1 Sep 2021 04:44:23 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:15378 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241376AbhIAIoW (ORCPT ); Wed, 1 Sep 2021 04:44:22 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GzyCh38chzbgJj; Wed, 1 Sep 2021 16:39:28 +0800 (CST) Received: from dggpeml500020.china.huawei.com (7.185.36.88) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 1 Sep 2021 16:43:23 +0800 Received: from huawei.com (10.175.127.227) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 1 Sep 2021 16:43:23 +0800 From: Baokun Li To: , , , , , , CC: , , Subject: [PATCH -next] scsi: iscsi: Adjuest iface sysfs attr detection Date: Wed, 1 Sep 2021 16:53:36 +0800 Message-ID: <20210901085336.2264295-1-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500020.china.huawei.com (7.185.36.88) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ISCSI_NET_PARAM_IFACE_ENABLE belongs to enum iscsi_net_param instead of iscsi_iface_param，so move it to ISCSI_NET_PARAM. Otherwise, when we call into the driver we might not match and return that we don't want attr visible in sysfs. Found in code review. Fixes: e746f3451ec7 ("scsi: iscsi: Fix iface sysfs attr detection") Signed-off-by: Baokun Li --- drivers/scsi/scsi_transport_iscsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index d8b05d8b5470..58027207f08d 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -441,9 +441,7 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj, struct iscsi_transport *t = iface->transport; int param = -1; - if (attr == &dev_attr_iface_enabled.attr) - param = ISCSI_NET_PARAM_IFACE_ENABLE; - else if (attr == &dev_attr_iface_def_taskmgmt_tmo.attr) + if (attr == &dev_attr_iface_def_taskmgmt_tmo.attr) param = ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO; else if (attr == &dev_attr_iface_header_digest.attr) param = ISCSI_IFACE_PARAM_HDRDGST_EN; @@ -483,7 +481,9 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj, if (param != -1) return t->attr_is_visible(ISCSI_IFACE_PARAM, param); - if (attr == &dev_attr_iface_vlan_id.attr) + if (attr == &dev_attr_iface_enabled.attr) + param = ISCSI_NET_PARAM_IFACE_ENABLE; + else if (attr == &dev_attr_iface_vlan_id.attr) param = ISCSI_NET_PARAM_VLAN_ID; else if (attr == &dev_attr_iface_vlan_priority.attr) param = ISCSI_NET_PARAM_VLAN_PRIORITY; -- 2.31.1