LU-17136 ldiskfs: increase max extent tree depth

this is an workaround until LU-16843 ready

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I5829c10888bf32649fe7a7a72c8ee697647a89cc
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52540
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/rhel8/ext4-deep-tree.patch b/ldiskfs/kernel_patches/patches/rhel8/ext4-deep-tree.patch
new file mode 100644 (file)
index 0000000..ca5ce05
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/rhel8/ext4-deep-tree.patch
@@ -0,0 +1,12 @@
+Index: linux-4.18.0-32.el8.x86_64/fs/ext4/ext4.h
+===================================================================
+--- linux-4.18.0-32.el8.x86_64.orig/fs/ext4/ext4_extents.h
++++ linux-4.18.0-32.el8.x86_64/fs/ext4/ext4_extents.h
+@@ -655,6 +655,6 @@ enum {
+ };
+
+ #define EXT4_EXT_MAGIC                cpu_to_le16(0xf30a)
+-#define EXT4_MAX_EXTENT_DEPTH 5
++#define EXT4_MAX_EXTENT_DEPTH 6
+
+ #define EXT4_EXTENT_TAIL_OFFSET(hdr) \

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
index fcef984..8382596 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
@@ -31,6 +31,7 @@ rhel7.6/ext4-dont-check-before-replay.patch
 rhel7.6/ext4-cleanup-goto-next-group.patch
 rhel7.6/ext4-reduce-lock-contention-in-__ext4_new_inode.patch
 rhel7.6/ext4-preread-gd.patch
+rhel8/ext4-deep-tree.patch
 rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel7.6/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
index fffffc5..783bceb 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
@@ -31,6 +31,7 @@ rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch
 base/ext4-projid-xattrs.patch
 rhel8.5/ext4-enc-flag.patch
 base/ext4-delayed-iput.patch
+rhel8/ext4-deep-tree.patch
 rhel8/ext4-add-periodic-superblock-update.patch
 rhel8.7/ext4-filename-encode.patch
 rhel8/ext4-old_ea_inodes_handling_fix.patch