On 2025/12/23 09:56, Hongbo Li wrote:
From: Hongzhen Luo <[email protected]>
Only files in the same domain will share the page cache. Also modify
the sysfs related content in preparation for the upcoming page cache
share feature.
Signed-off-by: Hongzhen Luo <[email protected]>
Signed-off-by: Hongbo Li <[email protected]>
---
fs/erofs/super.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 68480f10e69d..be9f96252c6c 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -518,6 +518,8 @@ static int erofs_fc_parse_param(struct fs_context *fc,
if (!sbi->fsid)
return -ENOMEM;
break;
+#endif
+#if defined(CONFIG_EROFS_FS_ONDEMAND) ||
defined(CONFIG_EROFS_FS_PAGE_CACHE_SHARE)
case Opt_domain_id:
kfree(sbi->domain_id);
sbi->domain_id = kstrdup(param->string, GFP_KERNEL);
@@ -618,7 +620,7 @@ static void erofs_set_sysfs_name(struct super_block *sb)
{
struct erofs_sb_info *sbi = EROFS_SB(sb);
- if (sbi->domain_id)
+ if (sbi->domain_id && !erofs_sb_has_ishare_xattrs(sbi))
super_set_sysfs_name_generic(sb, "%s,%s", sbi->domain_id,
sbi->fsid);
else if (sbi->fsid)
@@ -1052,6 +1054,8 @@ static int erofs_show_options(struct seq_file *seq,
struct dentry *root)
#ifdef CONFIG_EROFS_FS_ONDEMAND
here.
if (sbi->fsid)
seq_printf(seq, ",fsid=%s", sbi->fsid);
+#endif
+#if defined(CONFIG_EROFS_FS_ONDEMAND) ||
defined(CONFIG_EROFS_FS_PAGE_CACHE_SHARE)
I think we could just kill these `#if` entirely since
`sbi->domain_id` and `sbi->fsid` are defined
unconditionally.
Otherwise it looks good to me:
Reviewed-by: Gao Xiang <[email protected]>
Thanks,
Gao Xiang
