From 75d0f18729deecaa26b637c961b4221f38ee2c95 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Wed, 11 Oct 2023 23:27:04 +0300 Subject: [PATCH] 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 Change-Id: I201cfa5cb04907eef05bc87abc5701e8aed39d62 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52633 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin --- ldiskfs/kernel_patches/patches/rhel7.9/ext4-ext-merge.patch | 2 +- ldiskfs/kernel_patches/patches/rhel8/ext4-ext-merge.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 --- 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 --- 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; -- 1.8.3.1