| From 0f20b976b7612bb18adff751ea0b38f211b09fa4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 1 Sep 2021 16:53:36 +0800 |
| Subject: scsi: iscsi: Adjust iface sysfs attr detection |
| |
| From: Baokun Li <libaokun1@huawei.com> |
| |
| [ Upstream commit 4e28550829258f7dab97383acaa477bd724c0ff4 ] |
| |
| 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. |
| |
| Link: https://lore.kernel.org/r/20210901085336.2264295-1-libaokun1@huawei.com |
| Fixes: e746f3451ec7 ("scsi: iscsi: Fix iface sysfs attr detection") |
| Reviewed-by: Lee Duncan <lduncan@suse.com> |
| Signed-off-by: Baokun Li <libaokun1@huawei.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 77bba91b5714..6f21cb75d95f 100644 |
| --- a/drivers/scsi/scsi_transport_iscsi.c |
| +++ b/drivers/scsi/scsi_transport_iscsi.c |
| @@ -434,9 +434,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; |
| @@ -476,7 +474,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.33.0 |
| |
