Each namspace might have its own superblock, so add it as an argument
to configfs_pin_fs() to ensure that the correct filesystem instance
will be pinned.

Signed-off-by: Hannes Reinecke <hare@kernel.org>
---
 fs/configfs/dir.c        | 16 ++++++++--------
 include/linux/configfs.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 891238ef0088a98467d6d63a10d633a40fc19c8b..b87b92e3a248dfb091eb52727f06cc4551143f7b 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1935,7 +1935,7 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 		INIT_LIST_HEAD(&subsys->su_link);
 		mutex_init(&subsys->su_mutex);
 		config_group_init(&subsys->su_group);
-		err = subsys->fill_subsystem(subsys, info->ns_id);
+		err = subsys->fill_subsystem(subsys, info->net_ns);
 		if (err)
 			goto out_release;
 	}
@@ -1943,7 +1943,7 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 	err = configfs_link_root(info, subsys, root);
 	if (err) {
 		if (subsys->clear_subsystem)
-			subsys->clear_subsystem(subsys, info->ns_id);
+			subsys->clear_subsystem(subsys, info->net_ns);
 		goto out_release;
 	}
 
@@ -1968,7 +1968,7 @@ void configfs_link_subsystems(struct super_block *sb,
 
 	if (WARN_ON(IS_ERR(parent)))
 		return;
-	if ((info->ns_id == 0) || WARN_ON(parent == info))
+	if ((info->net_ns == &init_net) || WARN_ON(parent == info))
 		return;
 	mutex_lock(&parent->subsys_mutex);
 	list_splice_init(&parent->subsys_list, &subsys_list);
@@ -1987,7 +1987,7 @@ void configfs_link_subsystems(struct super_block *sb,
 		subsys->clear_subsystem = s->clear_subsystem;
 		INIT_LIST_HEAD(&subsys->su_link);
 		mutex_init(&subsys->su_mutex);
-		err = subsys->fill_subsystem(subsys, info->ns_id);
+		err = subsys->fill_subsystem(subsys, info->net_ns);
 		if (err) {
 			kfree(subsys);
 			continue;
@@ -1995,7 +1995,7 @@ void configfs_link_subsystems(struct super_block *sb,
 		root = configfs_pin_fs(sb);
 		if (IS_ERR(root)) {
 			if (subsys->clear_subsystem)
-				subsys->clear_subsystem(subsys, info->ns_id);
+				subsys->clear_subsystem(subsys, info->net_ns);
 			kfree(subsys);
 			continue;
 		}
@@ -2003,7 +2003,7 @@ void configfs_link_subsystems(struct super_block *sb,
 		if (err) {
 			configfs_release_fs(sb);
 			if (subsys->clear_subsystem)
-				subsys->clear_subsystem(subsys, info->ns_id);
+				subsys->clear_subsystem(subsys, info->net_ns);
 			kfree(subsys);
 			continue;
 		}
@@ -2070,7 +2070,7 @@ void configfs_unlink_subsystems(struct super_block *sb,
 		if (!configfs_unlink_root(subsys))
 			continue;
 		if (subsys->clear_subsystem)
-			subsys->clear_subsystem(subsys, info->ns_id);
+			subsys->clear_subsystem(subsys, info->net_ns);
 		unlink_group(&subsys->su_group);
 		configfs_release_fs(sb);
 		kfree(subsys);
@@ -2092,7 +2092,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
 	mutex_lock(&info->subsys_mutex);
 	list_del_init(&subsys->su_link);
 	if (subsys->clear_subsystem)
-		subsys->clear_subsystem(subsys, info->ns_id);
+		subsys->clear_subsystem(subsys, info->net_ns);
 	unlink_group(group);
 	mutex_unlock(&info->subsys_mutex);
 	configfs_release_fs(NULL);
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index c1cdadba0a48f0abea30da5ee324807b9ac4ff8f..893ae778585fb8be60026c661cb1ef63980ff0e3 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -231,9 +231,9 @@ struct configfs_subsystem {
 	struct config_group	su_group;
 	struct mutex		su_mutex;
 	int (*fill_subsystem)(struct configfs_subsystem *subsys,
-			      u64 ns_id);
+			      struct net *net_ns);
 	void (*clear_subsystem)(struct configfs_subsystem *subsys,
-				u64 ns_id);
+				struct net *net_ns);
 };
 
 static inline struct configfs_subsystem *to_configfs_subsystem(struct config_group *group)

-- 
2.51.0