From: Gao Xiang <hsiangkao@linux.alibaba.com>
Move the `struct erofs_anon_fs_type` to the super.c and
expose it in preparation for the upcoming page cache share
feature.
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
---
fs/erofs/fscache.c | 13 -------------
fs/erofs/internal.h | 2 ++
fs/erofs/super.c | 15 +++++++++++++++
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 7a346e20f7b7..f4937b025038 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -3,7 +3,6 @@
* Copyright (C) 2022, Alibaba Cloud
* Copyright (C) 2022, Bytedance Inc. All rights reserved.
*/
-#include <linux/pseudo_fs.h>
#include <linux/fscache.h>
#include "internal.h"
@@ -13,18 +12,6 @@ static LIST_HEAD(erofs_domain_list);
static LIST_HEAD(erofs_domain_cookies_list);
static struct vfsmount *erofs_pseudo_mnt;
-static int erofs_anon_init_fs_context(struct fs_context *fc)
-{
- return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
-}
-
-static struct file_system_type erofs_anon_fs_type = {
- .owner = THIS_MODULE,
- .name = "pseudo_erofs",
- .init_fs_context = erofs_anon_init_fs_context,
- .kill_sb = kill_anon_super,
-};
-
struct erofs_fscache_io {
struct netfs_cache_resources cres;
struct iov_iter iter;
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index f7f622836198..98fe652aea33 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -188,6 +188,8 @@ static inline bool erofs_is_fileio_mode(struct erofs_sb_info *sbi)
return IS_ENABLED(CONFIG_EROFS_FS_BACKED_BY_FILE) && sbi->dif0.file;
}
+extern struct file_system_type erofs_anon_fs_type;
+
static inline bool erofs_is_fscache_mode(struct super_block *sb)
{
return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &&
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 937a215f626c..2a44c4e5af4f 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -11,6 +11,7 @@
#include <linux/fs_parser.h>
#include <linux/exportfs.h>
#include <linux/backing-dev.h>
+#include <linux/pseudo_fs.h>
#include "xattr.h"
#define CREATE_TRACE_POINTS
@@ -936,6 +937,20 @@ static struct file_system_type erofs_fs_type = {
};
MODULE_ALIAS_FS("erofs");
+#if defined(CONFIG_EROFS_FS_ONDEMAND)
+static int erofs_anon_init_fs_context(struct fs_context *fc)
+{
+ return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
+}
+
+struct file_system_type erofs_anon_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "pseudo_erofs",
+ .init_fs_context = erofs_anon_init_fs_context,
+ .kill_sb = kill_anon_super,
+};
+#endif
+
static int __init erofs_module_init(void)
{
int err;
--
2.22.0
On 2025/12/24 12:09, Hongbo Li wrote:
> From: Gao Xiang <hsiangkao@linux.alibaba.com>
>
> Move the `struct erofs_anon_fs_type` to the super.c and
> expose it in preparation for the upcoming page cache share
> feature.
>
> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
> Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
Are you sure this is my previous version of this one?
Could you please check carefully before sending
out the next version?
Thanks,
Gao Xiang
> ---
> fs/erofs/fscache.c | 13 -------------
> fs/erofs/internal.h | 2 ++
> fs/erofs/super.c | 15 +++++++++++++++
> 3 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index 7a346e20f7b7..f4937b025038 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2022, Alibaba Cloud
> * Copyright (C) 2022, Bytedance Inc. All rights reserved.
> */
> -#include <linux/pseudo_fs.h>
> #include <linux/fscache.h>
> #include "internal.h"
>
> @@ -13,18 +12,6 @@ static LIST_HEAD(erofs_domain_list);
> static LIST_HEAD(erofs_domain_cookies_list);
> static struct vfsmount *erofs_pseudo_mnt;
>
> -static int erofs_anon_init_fs_context(struct fs_context *fc)
> -{
> - return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
> -}
> -
> -static struct file_system_type erofs_anon_fs_type = {
> - .owner = THIS_MODULE,
> - .name = "pseudo_erofs",
> - .init_fs_context = erofs_anon_init_fs_context,
> - .kill_sb = kill_anon_super,
> -};
> -
> struct erofs_fscache_io {
> struct netfs_cache_resources cres;
> struct iov_iter iter;
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index f7f622836198..98fe652aea33 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -188,6 +188,8 @@ static inline bool erofs_is_fileio_mode(struct erofs_sb_info *sbi)
> return IS_ENABLED(CONFIG_EROFS_FS_BACKED_BY_FILE) && sbi->dif0.file;
> }
>
> +extern struct file_system_type erofs_anon_fs_type;
> +
> static inline bool erofs_is_fscache_mode(struct super_block *sb)
> {
> return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &&
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index 937a215f626c..2a44c4e5af4f 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -11,6 +11,7 @@
> #include <linux/fs_parser.h>
> #include <linux/exportfs.h>
> #include <linux/backing-dev.h>
> +#include <linux/pseudo_fs.h>
> #include "xattr.h"
>
> #define CREATE_TRACE_POINTS
> @@ -936,6 +937,20 @@ static struct file_system_type erofs_fs_type = {
> };
> MODULE_ALIAS_FS("erofs");
>
> +#if defined(CONFIG_EROFS_FS_ONDEMAND)
> +static int erofs_anon_init_fs_context(struct fs_context *fc)
> +{
> + return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
> +}
> +
> +struct file_system_type erofs_anon_fs_type = {
> + .owner = THIS_MODULE,
> + .name = "pseudo_erofs",
> + .init_fs_context = erofs_anon_init_fs_context,
> + .kill_sb = kill_anon_super,
> +};
> +#endif
> +
> static int __init erofs_module_init(void)
> {
> int err;
On 2025/12/24 12:25, Gao Xiang wrote:
>
>
> On 2025/12/24 12:09, Hongbo Li wrote:
>> From: Gao Xiang <hsiangkao@linux.alibaba.com>
>>
>> Move the `struct erofs_anon_fs_type` to the super.c and
>> expose it in preparation for the upcoming page cache share
>> feature.
>>
>> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
>> Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
>
> Are you sure this is my previous version of this one?
>
> Could you please check carefully before sending
> out the next version?
Sorry, I mixed up my local patches. I will check carefully in the next time.
Thanks,
Hongbo
>
> Thanks,
> Gao Xiang
>
>> ---
>> fs/erofs/fscache.c | 13 -------------
>> fs/erofs/internal.h | 2 ++
>> fs/erofs/super.c | 15 +++++++++++++++
>> 3 files changed, 17 insertions(+), 13 deletions(-)
>>
>> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
>> index 7a346e20f7b7..f4937b025038 100644
>> --- a/fs/erofs/fscache.c
>> +++ b/fs/erofs/fscache.c
>> @@ -3,7 +3,6 @@
>> * Copyright (C) 2022, Alibaba Cloud
>> * Copyright (C) 2022, Bytedance Inc. All rights reserved.
>> */
>> -#include <linux/pseudo_fs.h>
>> #include <linux/fscache.h>
>> #include "internal.h"
>> @@ -13,18 +12,6 @@ static LIST_HEAD(erofs_domain_list);
>> static LIST_HEAD(erofs_domain_cookies_list);
>> static struct vfsmount *erofs_pseudo_mnt;
>> -static int erofs_anon_init_fs_context(struct fs_context *fc)
>> -{
>> - return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
>> -}
>> -
>> -static struct file_system_type erofs_anon_fs_type = {
>> - .owner = THIS_MODULE,
>> - .name = "pseudo_erofs",
>> - .init_fs_context = erofs_anon_init_fs_context,
>> - .kill_sb = kill_anon_super,
>> -};
>> -
>> struct erofs_fscache_io {
>> struct netfs_cache_resources cres;
>> struct iov_iter iter;
>> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
>> index f7f622836198..98fe652aea33 100644
>> --- a/fs/erofs/internal.h
>> +++ b/fs/erofs/internal.h
>> @@ -188,6 +188,8 @@ static inline bool erofs_is_fileio_mode(struct
>> erofs_sb_info *sbi)
>> return IS_ENABLED(CONFIG_EROFS_FS_BACKED_BY_FILE) &&
>> sbi->dif0.file;
>> }
>> +extern struct file_system_type erofs_anon_fs_type;
>> +
>> static inline bool erofs_is_fscache_mode(struct super_block *sb)
>> {
>> return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &&
>> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
>> index 937a215f626c..2a44c4e5af4f 100644
>> --- a/fs/erofs/super.c
>> +++ b/fs/erofs/super.c
>> @@ -11,6 +11,7 @@
>> #include <linux/fs_parser.h>
>> #include <linux/exportfs.h>
>> #include <linux/backing-dev.h>
>> +#include <linux/pseudo_fs.h>
>> #include "xattr.h"
>> #define CREATE_TRACE_POINTS
>> @@ -936,6 +937,20 @@ static struct file_system_type erofs_fs_type = {
>> };
>> MODULE_ALIAS_FS("erofs");
>> +#if defined(CONFIG_EROFS_FS_ONDEMAND)
>> +static int erofs_anon_init_fs_context(struct fs_context *fc)
>> +{
>> + return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
>> +}
>> +
>> +struct file_system_type erofs_anon_fs_type = {
>> + .owner = THIS_MODULE,
>> + .name = "pseudo_erofs",
>> + .init_fs_context = erofs_anon_init_fs_context,
>> + .kill_sb = kill_anon_super,
>> +};
>> +#endif
>> +
>> static int __init erofs_module_init(void)
>> {
>> int err;
>
© 2016 - 2026 Red Hat, Inc.