LU-17187 ldiskfs: use ext4_fsblk_t for block pointers

instead of ext4_lblk_t which is 32bit while actual block
pointers can be larger than 2^32.

Fixes: 0f7e6c02a9 ("LU-16843 ldiskfs: merge extent blocks")
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I201cfa5cb04907eef05bc87abc5701e8aed39d62
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52633
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/rhel7.9/ext4-ext-merge.patch b/ldiskfs/kernel_patches/patches/rhel7.9/ext4-ext-merge.patch
index 40d0b1e..acfeac3 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel7.9/ext4-ext-merge.patch
+++ b/ldiskfs/kernel_patches/patches/rhel7.9/ext4-ext-merge.patch
@@ -33,7 +33,7 @@ Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/extents.c
 +{
 +      unsigned int depth = ext_depth(inode);
 +      int used, nused, free, i, k, err;
-+      ext4_lblk_t next;
++      ext4_fsblk_t next;
 +
 +      if (path[depth].p_hdr == npath[depth].p_hdr)
 +              return 0;

diff --git a/ldiskfs/kernel_patches/patches/rhel8/ext4-ext-merge.patch b/ldiskfs/kernel_patches/patches/rhel8/ext4-ext-merge.patch
index cc2142e..5fe15e9 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel8/ext4-ext-merge.patch
+++ b/ldiskfs/kernel_patches/patches/rhel8/ext4-ext-merge.patch
@@ -33,7 +33,7 @@ Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/extents.c
 +{
 +      unsigned int depth = ext_depth(inode);
 +      int used, nused, free, i, k, err;
-+      ext4_lblk_t next;
++      ext4_fsblk_t next;
 +
 +      if (path[depth].p_hdr == npath[depth].p_hdr)
 +              return 0;