[PATCH 0/2] erofs: misc cleanups for fscache mode

[PATCH 0/2] erofs: misc cleanups for fscache mode

[Jingbo Xu]

Some trivial cleanups for fscache mode.

Jingbo Xu (2):
  erofs: add documentation for 'domain_id' mount option
  erofs: clean up parsing of fscache related options

 Documentation/filesystems/erofs.rst |  3 +++
 fs/erofs/super.c                    | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.19.1.6.gb485710b

[PATCH 1/2] erofs: add documentation for 'domain_id' mount option

[Jingbo Xu]

The share domain feature for fscache mode has been merged, and let's add
documentation for 'domain_id' mount option.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 Documentation/filesystems/erofs.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst
index 067fd1670b1f..958cad2c4997 100644
--- a/Documentation/filesystems/erofs.rst
+++ b/Documentation/filesystems/erofs.rst
@@ -120,6 +120,9 @@ dax={always,never}     Use direct access (no page cache).  See
 dax                    A legacy option which is an alias for ``dax=always``.
 device=%s              Specify a path to an extra device to be used together.
 fsid=%s                Specify a filesystem image ID for Fscache back-end.
+domain_id=%s           Specify a domain ID for Fscache back-end.  The blob
+                       images are shared among filesystem instances in the same
+                       domain.
 ===================    =========================================================
 
 Sysfs Entries
-- 
2.19.1.6.gb485710b

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

[Jingbo Xu]

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

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 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;
 	}
-- 
2.19.1.6.gb485710b

Re: [External] [PATCH 1/2] erofs: add documentation for 'domain_id' mount option

[Jia Zhu]

在 2023/1/11 16:15, Jingbo Xu 写道:
> The share domain feature for fscache mode has been merged, and let's add
> documentation for 'domain_id' mount option.
> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>

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

Thanks.
> ---
>   Documentation/filesystems/erofs.rst | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst
> index 067fd1670b1f..958cad2c4997 100644
> --- a/Documentation/filesystems/erofs.rst
> +++ b/Documentation/filesystems/erofs.rst
> @@ -120,6 +120,9 @@ dax={always,never}     Use direct access (no page cache).  See
>   dax                    A legacy option which is an alias for ``dax=always``.
>   device=%s              Specify a path to an extra device to be used together.
>   fsid=%s                Specify a filesystem image ID for Fscache back-end.
> +domain_id=%s           Specify a domain ID for Fscache back-end.  The blob
> +                       images are shared among filesystem instances in the same
> +                       domain.
>   ===================    =========================================================
>   
>   Sysfs Entries

Re: [PATCH 1/2] erofs: add documentation for 'domain_id' mount option

[Gao Xiang]

On 2023/1/11 16:15, Jingbo Xu wrote:
> The share domain feature for fscache mode has been merged, and let's add
> documentation for 'domain_id' mount option.
Since the EROFS share domain feature for fscache mode has been available
since Linux v6.1, let's add documentation for 'domain_id' mount option.

Cc: linux-doc@vger.kernel.org

> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
> ---
>   Documentation/filesystems/erofs.rst | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst
> index 067fd1670b1f..958cad2c4997 100644
> --- a/Documentation/filesystems/erofs.rst
> +++ b/Documentation/filesystems/erofs.rst
> @@ -120,6 +120,9 @@ dax={always,never}     Use direct access (no page cache).  See
>   dax                    A legacy option which is an alias for ``dax=always``.
>   device=%s              Specify a path to an extra device to be used together.
>   fsid=%s                Specify a filesystem image ID for Fscache back-end.
> +domain_id=%s           Specify a domain ID for Fscache back-end.  The blob
> +                       images are shared among filesystem instances in the same
> +                       domain.

domain_id=%s           Specify a domain ID in fscache mode so that different images
                        with the same blobs under a given domain ID can share storage.

Thanks,
Gao Xiang

>   ===================    =========================================================
>   
>   Sysfs Entries

Re: [PATCH 1/2] erofs: add documentation for 'domain_id' mount option

[Gao Xiang]

On 2023/1/11 16:15, Jingbo Xu wrote:
> The share domain feature for fscache mode has been merged, and let's add
> documentation for 'domain_id' mount option.
Since the EROFS share domain feature for fscache mode has been available
since Linux v6.1, let's add documentation for 'domain_id' mount option.

Cc: linux-doc@vger.kernel.org

> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
> ---
>   Documentation/filesystems/erofs.rst | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst
> index 067fd1670b1f..958cad2c4997 100644
> --- a/Documentation/filesystems/erofs.rst
> +++ b/Documentation/filesystems/erofs.rst
> @@ -120,6 +120,9 @@ dax={always,never}     Use direct access (no page cache).  See
>   dax                    A legacy option which is an alias for ``dax=always``.
>   device=%s              Specify a path to an extra device to be used together.
>   fsid=%s                Specify a filesystem image ID for Fscache back-end.
> +domain_id=%s           Specify a domain ID for Fscache back-end.  The blob
> +                       images are shared among filesystem instances in the same
> +                       domain.

domain_id=%s           Specify a domain ID in fscache mode so that different images
                        with the same blobs under a given domain ID can share storage.

Thanks,
Gao Xiang

>   ===================    =========================================================
>   
>   Sysfs Entries

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 <jefflexu@linux.alibaba.com>

Reviewed-by: Jia Zhu <zhujia.zj@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;
>   	}

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

[Gao Xiang]

On 2023/1/11 16:15, Jingbo Xu wrote:
> ... to avoid the mess of conditional preprocessing as we are continually
> adding fscache related mount options.
> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>


Reviewd-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Thanks,
Gao Xiang

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

[Yue Hu]

On Wed, 11 Jan 2023 16:15:47 +0800
Jingbo Xu <jefflexu@linux.alibaba.com> wrote:

> ... to avoid the mess of conditional preprocessing as we are continually
> adding fscache related mount options.
> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>

Reviewed-by: Yue Hu <huyue2@coolpad.com>