From e2ac71cee275d2e12e2ef4b461dd7b8687949bc7 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Wed, 31 Jan 2024 23:05:49 +0300 Subject: [PATCH] EX-9107 ldiskfs: sync ext4-mballoc-dense with master extend ac_flags to fit new EXT4_MB_VERY_DENSE Fixes: f36eda6a1e ("LU-10026 osd-ldiskfs: use preallocation for dense writes") Signed-off-by: Alex Zhuravlev Change-Id: Id024cbca902d56728133d7d3e69d56fc355c1bc1 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53871 Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- ldiskfs/kernel_patches/patches/rhel8/ext4-mballoc-dense.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ldiskfs/kernel_patches/patches/rhel8/ext4-mballoc-dense.patch b/ldiskfs/kernel_patches/patches/rhel8/ext4-mballoc-dense.patch index 2956e04..f270e64 100644 --- a/ldiskfs/kernel_patches/patches/rhel8/ext4-mballoc-dense.patch +++ b/ldiskfs/kernel_patches/patches/rhel8/ext4-mballoc-dense.patch @@ -9,6 +9,15 @@ unsigned short pa_type; /* pa type. inode or group */ unsigned short pa_error; spinlock_t *pa_obj_lock; ++@@ -167,7 +167,7 @@ struct ext4_allocation_request { ++ __u16 ac_found; ++ __u16 ac_tail; ++ __u16 ac_buddy; ++- __u16 ac_flags; /* allocation hints */ +++ __u32 ac_flags; /* allocation hints */ ++ __u8 ac_status; ++ __u8 ac_criteria; ++ __u8 ac_2order; /* if request is to allocate 2^N blocks and --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ext4.h +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h @@ -151,6 +151,7 @@ enum SHIFT_DIRECTION { @@ -23,7 +32,7 @@ /* Caller will submit data before dropping transaction handle. This * allows jbd2 to avoid submitting data before commit. */ #define EXT4_GET_BLOCKS_IO_SUBMIT 0x0400 -+#define EXT4_GET_BLOCKS_VERY_DENSE 0x0800 ++#define EXT4_GET_BLOCKS_VERY_DENSE 0x80000 /* * The bit position of these flags must not overlap with any of the -- 1.8.3.1