1 files changed, 22 insertions, 11 deletions

diff --git a/fs/nsfs.c b/fs/nsfs.c
index 2ce229af34e9..7aaafb5cb9fc 100644
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -50,19 +50,13 @@ static void nsfs_evict(struct inode *inode)
 int ns_get_path_cb(struct path *path, ns_get_path_helper_t *ns_get_cb,
 		     void *private_data)
 {
-	int ret;
 	struct ns_common *ns;
 
 	ns = ns_get_cb(private_data);
 	if (!ns)
 		return -ENOENT;
-	ret = path_from_stashed(&ns->stashed, ns->inum, nsfs_mnt,
-				&ns_file_operations, NULL, ns, path);
-	if (ret <= 0)
-		ns->ops->put(ns);
-	if (ret < 0)
-		return ret;
-	return 0;
+
+	return path_from_stashed(&ns->stashed, ns->inum, nsfs_mnt, ns, path);
 }
 
 struct ns_get_path_task_args {
@@ -108,9 +102,7 @@ int open_related_ns(struct ns_common *ns,
 	}
 
 	err = path_from_stashed(&relative->stashed, relative->inum, nsfs_mnt,
-				&ns_file_operations, NULL, relative, &path);
-	if (err <= 0)
-		relative->ops->put(relative);
+				relative, &path);
 	if (err < 0) {
 		put_unused_fd(fd);
 		return err;
@@ -207,6 +199,24 @@ static const struct super_operations nsfs_ops = {
 	.show_path = nsfs_show_path,
 };
 
+static void nsfs_init_inode(struct inode *inode, void *data)
+{
+	inode->i_private = data;
+	inode->i_mode |= S_IRUGO;
+	inode->i_fop = &ns_file_operations;
+}
+
+static void nsfs_put_data(void *data)
+{
+	struct ns_common *ns = data;
+	ns->ops->put(ns);
+}
+
+static const struct stashed_operations nsfs_stashed_ops = {
+	.init_inode = nsfs_init_inode,
+	.put_data = nsfs_put_data,
+};
+
 static int nsfs_init_fs_context(struct fs_context *fc)
 {
 	struct pseudo_fs_context *ctx = init_pseudo(fc, NSFS_MAGIC);
@@ -214,6 +224,7 @@ static int nsfs_init_fs_context(struct fs_context *fc)
 		return -ENOMEM;
 	ctx->ops = &nsfs_ops;
 	ctx->dops = &ns_dentry_operations;
+	fc->s_fs_info = (void *)&nsfs_stashed_ops;
 	return 0;
 }