[PATCH] erofs: fix ztailpacking on > 4GiB filesystems

Gao Xiang posted 1 patch 4 years, 4 months ago
fs/erofs/internal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] erofs: fix ztailpacking on > 4GiB filesystems
Posted by Gao Xiang 4 years, 4 months ago
z_idataoff here is an absolute physical offset, so it should use
erofs_off_t (64 bits at least). Otherwise, it'll get trimmed and
cause the decompresion failure.

Fixes: ab92184ff8f1 ("erofs: add on-disk compressed tail-packing inline support")
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
 fs/erofs/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index b8272fb95fd6..5aa2cf2c2f80 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -325,7 +325,7 @@ struct erofs_inode {
 			unsigned char  z_algorithmtype[2];
 			unsigned char  z_logical_clusterbits;
 			unsigned long  z_tailextent_headlcn;
-			unsigned int   z_idataoff;
+			erofs_off_t    z_idataoff;
 			unsigned short z_idata_size;
 		};
 #endif	/* CONFIG_EROFS_FS_ZIP */
-- 
2.24.4

Re: [PATCH] erofs: fix ztailpacking on > 4GiB filesystems
Posted by Chao Yu 4 years, 3 months ago
On 2022/2/22 11:31, Gao Xiang wrote:
> z_idataoff here is an absolute physical offset, so it should use
> erofs_off_t (64 bits at least). Otherwise, it'll get trimmed and
> cause the decompresion failure.
> 
> Fixes: ab92184ff8f1 ("erofs: add on-disk compressed tail-packing inline support")
> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,
Re: [PATCH] erofs: fix ztailpacking on > 4GiB filesystems
Posted by Gao Xiang 4 years, 3 months ago
On Wed, Mar 02, 2022 at 10:49:47AM +0800, Chao Yu wrote:
> On 2022/2/22 11:31, Gao Xiang wrote:
> > z_idataoff here is an absolute physical offset, so it should use
> > erofs_off_t (64 bits at least). Otherwise, it'll get trimmed and
> > cause the decompresion failure.
> > 
> > Fixes: ab92184ff8f1 ("erofs: add on-disk compressed tail-packing inline support")
> > Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
> 
> Reviewed-by: Chao Yu <chao@kernel.org>

Thanks Chao. Yeah, I will submit it this week..

Thanks,
Gao Xiang

> 
> Thanks,
Re: [PATCH] erofs: fix ztailpacking on > 4GiB filesystems
Posted by Yue Hu 4 years, 4 months ago
On Tue, 22 Feb 2022 11:31:18 +0800
Gao Xiang <hsiangkao@linux.alibaba.com> wrote:

> z_idataoff here is an absolute physical offset, so it should use
> erofs_off_t (64 bits at least). Otherwise, it'll get trimmed and
> cause the decompresion failure.
> 
> Fixes: ab92184ff8f1 ("erofs: add on-disk compressed tail-packing inline support")
> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
> ---
>  fs/erofs/internal.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index b8272fb95fd6..5aa2cf2c2f80 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -325,7 +325,7 @@ struct erofs_inode {
>  			unsigned char  z_algorithmtype[2];
>  			unsigned char  z_logical_clusterbits;
>  			unsigned long  z_tailextent_headlcn;
> -			unsigned int   z_idataoff;
> +			erofs_off_t    z_idataoff;
>  			unsigned short z_idata_size;
>  		};
>  #endif	/* CONFIG_EROFS_FS_ZIP */

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