Re: [External] [PATCH 2/2] erofs: clean up parsing of fscache related options

[Jia Zhu]

在 2023/1/11 16:15, Jingbo Xu 写道:

... to avoid the mess of conditional preprocessing as we are continually
adding fscache related mount options.

Signed-off-by: Jingbo Xu <jeffl...@linux.alibaba.com>

Reviewed-by: Jia Zhu <zhujia...@bytedance.com>

Thanks.

---
  fs/erofs/super.c | 13 ++++++-------
  1 file 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;
        }