LU-15555 ldiskfs: large directory causes htree corruption

When creating a lot of files in a single directory, it can
get corrupted because of a typo in ext4-kill-dx-root.patch.

Lustre-change: https://review.whamcloud.com/46526
Lustre-commit: ea3ee9337f9bcd42360e4523f1e34bcd04d3bf41

Change-Id: Ia36278580741e1eb905e24a3a6231ba7daaa882a
Fixes: 20a6d32 ("LU-12637 kernel: RHEL 8.1 server support")
HPE-bug-id: LUS-10730
Signed-off-by: Andrew Perepechko <c17827@cray.com>
Signed-off-by: Alexander Zarochentsev <c17826@cray.com>
Signed-off-by: Artem Blagodarenko <artem.blagodarenko@hpe.com>
Reviewed-on: https://review.whamcloud.com/48545
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Artem Blagodarenko <ablagodarenko@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/linux-5.4/ext4-kill-dx-root.patch b/ldiskfs/kernel_patches/patches/linux-5.4/ext4-kill-dx-root.patch
index 0b071b9..b783219 100644 (file)
--- a/ldiskfs/kernel_patches/patches/linux-5.4/ext4-kill-dx-root.patch
+++ b/ldiskfs/kernel_patches/patches/linux-5.4/ext4-kill-dx-root.patch
@@ -232,7 +232,7 @@ index a1db7ce..b0291ed 100644
 -                      dxroot->info.indirect_levels += 1;
 +                      info = dx_get_dx_info((struct ext4_dir_entry_2 *)
 +                                            frames[0].bh->b_data);
-+                      info->indirect_levels = 1;
++                      info->indirect_levels += 1;
                        dxtrace(printk(KERN_DEBUG
                                       "Creating %d level index...\n",
                                       dxroot->info.indirect_levels));

diff --git a/ldiskfs/kernel_patches/patches/linux-5.8/ext4-kill-dx-root.patch b/ldiskfs/kernel_patches/patches/linux-5.8/ext4-kill-dx-root.patch
index ef2a361..5b2c4cc 100644 (file)
--- a/ldiskfs/kernel_patches/patches/linux-5.8/ext4-kill-dx-root.patch
+++ b/ldiskfs/kernel_patches/patches/linux-5.8/ext4-kill-dx-root.patch
@@ -230,7 +230,7 @@ Subject: [PATCH] + linux-5.3/ext4-kill-dx-root
 -                      dxroot->info.indirect_levels += 1;
 +                      info = dx_get_dx_info((struct ext4_dir_entry_2 *)
 +                                            frames[0].bh->b_data);
-+                      info->indirect_levels = 1;
++                      info->indirect_levels += 1;
                        dxtrace(printk(KERN_DEBUG
                                       "Creating %d level index...\n",
                                       dxroot->info.indirect_levels));

diff --git a/ldiskfs/kernel_patches/patches/rhel8.1/ext4-kill-dx-root.patch b/ldiskfs/kernel_patches/patches/rhel8.1/ext4-kill-dx-root.patch
index b212574..3f1b75e 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel8.1/ext4-kill-dx-root.patch
+++ b/ldiskfs/kernel_patches/patches/rhel8.1/ext4-kill-dx-root.patch
@@ -224,7 +224,7 @@ Index: linux-4.18.0-147.0.3.el8/fs/ext4/namei.c
 -                      dxroot->info.indirect_levels += 1;
 +                      info = dx_get_dx_info((struct ext4_dir_entry_2 *)
 +                                            frames[0].bh->b_data);
-+                      info->indirect_levels = 1;
++                      info->indirect_levels += 1;
                        dxtrace(printk(KERN_DEBUG
                                       "Creating %d level index...\n",
                                       dxroot->info.indirect_levels));

diff --git a/ldiskfs/kernel_patches/patches/ubuntu18/ext4-kill-dx-root.patch b/ldiskfs/kernel_patches/patches/ubuntu18/ext4-kill-dx-root.patch
index 62c507f..f496781 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ubuntu18/ext4-kill-dx-root.patch
+++ b/ldiskfs/kernel_patches/patches/ubuntu18/ext4-kill-dx-root.patch
@@ -224,7 +224,7 @@ Index: linux-4.15.0/fs/ext4/namei.c
 -                      dxroot->info.indirect_levels += 1;
 +                      info = dx_get_dx_info((struct ext4_dir_entry_2 *)
 +                                            frames[0].bh->b_data);
-+                      info->indirect_levels = 1;
++                      info->indirect_levels += 1;
                        dxtrace(printk(KERN_DEBUG
                                       "Creating %d level index...\n",
                                       info->indirect_levels));