[RFC PATCH 9/9] iscsi: filter flashnode sysfs by net namespace

[Lee Duncan]

From: Lee Duncan <ldun...@suse.com>

This finishes the net namespace support for flashnode sysfs devices.

Signed-off-by: Chris Leech <cle...@redhat.com>
Signed-off-by: Lee Duncan <ldun...@suse.com>
---
 drivers/scsi/scsi_transport_iscsi.c | 34 +++++++++++++++++++++++++++++
 include/scsi/scsi_transport_iscsi.h |  4 ----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c 
b/drivers/scsi/scsi_transport_iscsi.c
index 13393c025ccb..9a176ea0d866 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1268,8 +1268,42 @@ static int iscsi_is_flashnode_conn_dev(struct device 
*dev, void *data)
        return dev->type == &iscsi_flashnode_conn_dev_type;
 }
 
+static struct net *iscsi_flashnode_sess_net(struct iscsi_flash_session *f_sess)
+{
+       struct Scsi_Host *shost = iscsi_flash_session_to_shost(f_sess);
+       struct iscsi_cls_host *ihost = shost->shost_data;
+
+       return iscsi_host_net(ihost);
+}
+
+static struct net *iscsi_flashnode_conn_net(struct iscsi_flash_conn *f_conn)
+{
+       struct iscsi_flash_session *f_sess =
+               iscsi_flash_conn_to_flash_session(f_conn);
+
+       return iscsi_flashnode_sess_net(f_sess);
+}
+
+static const void *iscsi_flashnode_namespace(const struct device *dev)
+{
+       struct iscsi_flash_conn *f_conn;
+       struct iscsi_flash_session *f_sess;
+       struct device *dev_tmp = (struct device *)dev;
+
+       if (iscsi_is_flashnode_conn_dev(dev_tmp, NULL)) {
+               f_conn = iscsi_dev_to_flash_conn(dev);
+               return iscsi_flashnode_conn_net(f_conn);
+       } else if (iscsi_is_flashnode_session_dev(dev_tmp)) {
+               f_sess = iscsi_dev_to_flash_session(dev);
+               return iscsi_flashnode_sess_net(f_sess);
+       }
+       return NULL;
+}
+
 static struct class iscsi_flashnode = {
        .name = "iscsi_flashnode",
+       .ns_type = &net_ns_type_operations,
+       .namespace = iscsi_flashnode_namespace,
 };
 
 /**
diff --git a/include/scsi/scsi_transport_iscsi.h 
b/include/scsi/scsi_transport_iscsi.h
index d03d9eb5707b..0c3fd690ecf8 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -504,8 +504,6 @@ extern void
 iscsi_destroy_flashnode_sess(struct iscsi_flash_session *fnode_sess);
 
 extern void iscsi_destroy_all_flashnode(struct Scsi_Host *shost);
-extern int iscsi_flashnode_bus_match(struct device *dev,
-                                    struct device_driver *drv);
 extern struct device *
 iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data,
                          int (*fn)(struct device *dev, void *data));
@@ -514,8 +512,6 @@ iscsi_find_flashnode_conn(struct iscsi_flash_session 
*fnode_sess);
 
 extern bool iscsi_is_flashnode_session_dev(struct device *dev);
 
-extern bool iscsi_is_flashnode_session_dev(struct device *dev);
-
 extern char *
 iscsi_get_ipaddress_state_name(enum iscsi_ipaddress_state port_state);
 extern char *iscsi_get_router_state_name(enum iscsi_router_state router_state);
-- 
2.39.1

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to open-iscsi+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/open-iscsi/283ecc31424b7f5e8e3dd68aa2283fcd109de145.1675876736.git.lduncan%40suse.com.