summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-05-11 11:43:59 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2019-05-25 18:06:16 -0400
commit8d9e46d80777b484f8f0945c317ad618224d7811 (patch)
tree79be70d9d810d45a7dacaff418f3ffa86452e4e0 /fs
parent389e22fb46eb1f48b089060c30030790e7a41033 (diff)
downloadlinux-stable-8d9e46d80777b484f8f0945c317ad618224d7811.tar.gz
linux-stable-8d9e46d80777b484f8f0945c317ad618224d7811.tar.bz2
linux-stable-8d9e46d80777b484f8f0945c317ad618224d7811.zip
fold mount_pseudo_xattr() into pseudo_fs_get_tree()
... now that all other callers are gone Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/libfs.c88
1 files changed, 34 insertions, 54 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index edef70d35438..7df3c9a85f6b 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -240,16 +240,43 @@ static const struct super_operations simple_super_operations = {
static int pseudo_fs_get_tree(struct fs_context *fc)
{
struct pseudo_fs_context *ctx = fc->fs_private;
- struct dentry *root;
+ struct super_block *s;
+ struct inode *root;
- root = mount_pseudo_xattr(fc->fs_type,
- ctx->ops, ctx->xattr,
- ctx->dops, ctx->magic);
- if (IS_ERR(root))
- return PTR_ERR(root);
+ s = sget_userns(fc->fs_type, NULL, set_anon_super, SB_KERNMOUNT|SB_NOUSER,
+ &init_user_ns, NULL);
+ if (IS_ERR(s))
+ return PTR_ERR(s);
- fc->root = root;
+ s->s_maxbytes = MAX_LFS_FILESIZE;
+ s->s_blocksize = PAGE_SIZE;
+ s->s_blocksize_bits = PAGE_SHIFT;
+ s->s_magic = ctx->magic;
+ s->s_op = ctx->ops ?: &simple_super_operations;
+ s->s_xattr = ctx->xattr;
+ s->s_time_gran = 1;
+ root = new_inode(s);
+ if (!root)
+ goto Enomem;
+ /*
+ * since this is the first inode, make it number 1. New inodes created
+ * after this must take care not to collide with it (by passing
+ * max_reserved of 1 to iunique).
+ */
+ root->i_ino = 1;
+ root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR;
+ root->i_atime = root->i_mtime = root->i_ctime = current_time(root);
+ s->s_root = d_make_root(root);
+ if (!s->s_root)
+ goto Enomem;
+ s->s_d_op = ctx->dops;
+ s->s_flags |= SB_ACTIVE;
+ fc->root = dget(s->s_root);
return 0;
+
+Enomem:
+ deactivate_locked_super(s);
+ return -ENOMEM;
}
static void pseudo_fs_free(struct fs_context *fc)
@@ -281,53 +308,6 @@ struct pseudo_fs_context *init_pseudo(struct fs_context *fc,
}
EXPORT_SYMBOL(init_pseudo);
-/*
- * Common helper for pseudo-filesystems (sockfs, pipefs, bdev - stuff that
- * will never be mountable)
- */
-struct dentry *mount_pseudo_xattr(struct file_system_type *fs_type,
- const struct super_operations *ops, const struct xattr_handler **xattr,
- const struct dentry_operations *dops, unsigned long magic)
-{
- struct super_block *s;
- struct inode *root;
-
- s = sget_userns(fs_type, NULL, set_anon_super, SB_KERNMOUNT|SB_NOUSER,
- &init_user_ns, NULL);
- if (IS_ERR(s))
- return ERR_CAST(s);
-
- s->s_maxbytes = MAX_LFS_FILESIZE;
- s->s_blocksize = PAGE_SIZE;
- s->s_blocksize_bits = PAGE_SHIFT;
- s->s_magic = magic;
- s->s_op = ops ? ops : &simple_super_operations;
- s->s_xattr = xattr;
- s->s_time_gran = 1;
- root = new_inode(s);
- if (!root)
- goto Enomem;
- /*
- * since this is the first inode, make it number 1. New inodes created
- * after this must take care not to collide with it (by passing
- * max_reserved of 1 to iunique).
- */
- root->i_ino = 1;
- root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR;
- root->i_atime = root->i_mtime = root->i_ctime = current_time(root);
- s->s_root = d_make_root(root);
- if (!s->s_root)
- goto Enomem;
- s->s_d_op = dops;
- s->s_flags |= SB_ACTIVE;
- return dget(s->s_root);
-
-Enomem:
- deactivate_locked_super(s);
- return ERR_PTR(-ENOMEM);
-}
-EXPORT_SYMBOL(mount_pseudo_xattr);
-
int simple_open(struct inode *inode, struct file *file)
{
if (inode->i_private)