[RESEND PATCH] erofs: relax the constraint of non-empty device tag in flatdev mode

[RESEND PATCH] erofs: relax the constraint of non-empty device tag in flatdev mode

[Jingbo Xu]

The device tag is not required in flatdev mode, and thus relax this
constraint in flatdev mode.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
Sorry I forget to cc linux-erofs@lists.ozlabs.org in the former patch.
---
 fs/erofs/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 44a24d573f1f..3700af9ee173 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -235,7 +235,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
 		return PTR_ERR(ptr);
 	dis = ptr + erofs_blkoff(sb, *pos);
 
-	if (!dif->path) {
+	if (!sbi->devs->flatdev && !dif->path) {
 		if (!dis->tag[0]) {
 			erofs_err(sb, "empty device tag @ pos %llu", *pos);
 			return -EINVAL;
-- 
2.19.1.6.gb485710b

Re: [External] [RESEND PATCH] erofs: relax the constraint of non-empty device tag in flatdev mode

[Jia Zhu via Linux-erofs]

在 2023/9/15 16:27, Jingbo Xu 写道:
> The device tag is not required in flatdev mode, and thus relax this
> constraint in flatdev mode.
> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>

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

> ---
> Sorry I forget to cc linux-erofs@lists.ozlabs.org in the former patch.
> ---
>   fs/erofs/super.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index 44a24d573f1f..3700af9ee173 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -235,7 +235,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
>   		return PTR_ERR(ptr);
>   	dis = ptr + erofs_blkoff(sb, *pos);
>   
> -	if (!dif->path) {
> +	if (!sbi->devs->flatdev && !dif->path) {
>   		if (!dis->tag[0]) {
>   			erofs_err(sb, "empty device tag @ pos %llu", *pos);
>   			return -EINVAL;

Re: [RESEND PATCH] erofs: relax the constraint of non-empty device tag in flatdev mode

[Gao Xiang]

On 2023/9/15 16:27, Jingbo Xu wrote:
> The device tag is not required in flatdev mode, and thus relax this
> constraint in flatdev mode.
> 
> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>

I tend to update the subject title and commit message as a fix:

erofs: allow empty device tags in flatdev mode

Device tags aren't actually required in flatdev mode, thus
fix mount failure due to empty device tags in flatdev mode.

Fixes: 8b465fecc35a ("erofs: support flattened block device for multi-blob images")
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Thanks,
Gao Xiang