Merge tag 'erofs-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang...

[linux-2.6-microblaze.git] / fs / erofs / super.c

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 9b4b66d..6fbb1fb 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -579,13 +579,6 @@ static const struct export_operations erofs_export_ops = {
        .get_parent = erofs_get_parent,
 };
 
-static int erofs_fc_fill_pseudo_super(struct super_block *sb, struct fs_context *fc)
-{
-       static const struct tree_descr empty_descr = {""};
-
-       return simple_fill_super(sb, EROFS_SUPER_MAGIC, &empty_descr);
-}
-
 static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
 {
        struct inode *inode;
@@ -712,11 +705,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
        return 0;
 }
 
-static int erofs_fc_anon_get_tree(struct fs_context *fc)
-{
-       return get_tree_nodev(fc, erofs_fc_fill_pseudo_super);
-}
-
 static int erofs_fc_get_tree(struct fs_context *fc)
 {
        struct erofs_fs_context *ctx = fc->fs_private;
@@ -789,20 +777,10 @@ static const struct fs_context_operations erofs_context_ops = {
        .free           = erofs_fc_free,
 };
 
-static const struct fs_context_operations erofs_anon_context_ops = {
-       .get_tree       = erofs_fc_anon_get_tree,
-};
-
 static int erofs_init_fs_context(struct fs_context *fc)
 {
        struct erofs_fs_context *ctx;
 
-       /* pseudo mount for anon inodes */
-       if (fc->sb_flags & SB_KERNMOUNT) {
-               fc->ops = &erofs_anon_context_ops;
-               return 0;
-       }
-
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
                return -ENOMEM;
@@ -824,12 +802,6 @@ static void erofs_kill_sb(struct super_block *sb)
 {
        struct erofs_sb_info *sbi;
 
-       /* pseudo mount for anon inodes */
-       if (sb->s_flags & SB_KERNMOUNT) {
-               kill_anon_super(sb);
-               return;
-       }
-
        if (erofs_is_fscache_mode(sb))
                kill_anon_super(sb);
        else
@@ -868,7 +840,7 @@ static void erofs_put_super(struct super_block *sb)
        erofs_fscache_unregister_fs(sb);
 }
 
-struct file_system_type erofs_fs_type = {
+static struct file_system_type erofs_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "erofs",
        .init_fs_context = erofs_init_fs_context,