summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJingbo Xu <jefflexu@linux.alibaba.com>2023-01-12 14:54:31 +0800
committerGao Xiang <hsiangkao@linux.alibaba.com>2023-01-16 22:39:47 +0800
commite02ac3e7329f76c5de40cba2746cbe165f571dff (patch)
treecdb17540abeefd87cc9fd4d8ebc5f88d911b6ffd /fs
parentb22c7b97189d461d7143052da83b36390c623b54 (diff)
downloadlinux-rpi-e02ac3e7329f76c5de40cba2746cbe165f571dff.tar.gz
linux-rpi-e02ac3e7329f76c5de40cba2746cbe165f571dff.tar.bz2
linux-rpi-e02ac3e7329f76c5de40cba2746cbe165f571dff.zip
erofs: clean up parsing of fscache related options
... to avoid the mess of conditional preprocessing as we are continually adding fscache related mount options. Reviewd-by: Gao Xiang <hsiangkao@linux.alibaba.com> Reviewed-by: Yue Hu <huyue2@coolpad.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> Link: https://lore.kernel.org/r/20230112065431.124926-3-jefflexu@linux.alibaba.com Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/erofs/super.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 481788c24a68..626a615dafc2 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -577,26 +577,25 @@ static int erofs_fc_parse_param(struct fs_context *fc,
}
++ctx->devs->extra_devices;
break;
- case Opt_fsid:
#ifdef CONFIG_EROFS_FS_ONDEMAND
+ case Opt_fsid:
kfree(ctx->fsid);
ctx->fsid = kstrdup(param->string, GFP_KERNEL);
if (!ctx->fsid)
return -ENOMEM;
-#else
- errorfc(fc, "fsid option not supported");
-#endif
break;
case Opt_domain_id:
-#ifdef CONFIG_EROFS_FS_ONDEMAND
kfree(ctx->domain_id);
ctx->domain_id = kstrdup(param->string, GFP_KERNEL);
if (!ctx->domain_id)
return -ENOMEM;
+ break;
#else
- errorfc(fc, "domain_id option not supported");
-#endif
+ case Opt_fsid:
+ case Opt_domain_id:
+ errorfc(fc, "%s option not supported", erofs_fs_parameters[opt].name);
break;
+#endif
default:
return -ENOPARAM;
}