LU-12353 ldiskfs: add ext4-dquot-commit-speedup patch to more series

Add ext4-dquot-commit-speedup.patch to RHEL 8.x and RHEL 9.x
ldiskfs patch series.

Test-Parameters: trivial clientdistro=el8.7 serverdistro=el8.7 testlist=sanity
Test-Parameters: trivial clientdistro=el8.8 serverdistro=el8.8 testlist=sanity
Test-Parameters: trivial clientdistro=el9.1 serverdistro=el9.1 testlist=sanity

Change-Id: Ib0ac325bde442b4eafedde9ba44984b02d5ea061
Fixes: dad25f258e50 ("LU-12353 ldiskfs: speedup quota journalling")
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50853
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>

diff --git a/ldiskfs/kernel_patches/patches/rhel9/ext4-dquot-commit-speedup.patch b/ldiskfs/kernel_patches/patches/rhel9/ext4-dquot-commit-speedup.patch
new file mode 100644 (file)
index 0000000..3db463a
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/rhel9/ext4-dquot-commit-speedup.patch
@@ -0,0 +1,11 @@
+--- a/fs/ext4/super.c  2023-05-12 10:38:47.356662467 -0700
++++ b/fs/ext4/super.c  2023-05-12 10:42:30.325161896 -0700
+@@ -6739,6 +6739,8 @@ static int ext4_mark_dquot_dirty(struct
+       struct super_block *sb = dquot->dq_sb;
+ 
+       if (ext4_is_quota_journalled(sb)) {
++              if (test_bit(DQ_MOD_B, &dquot->dq_flags))
++                      return 0;
+               dquot_mark_dquot_dirty(dquot);
+               return ext4_write_dquot(dquot);
+       } else {

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
index 38b97ff..a47ca55 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
@@ -26,6 +26,7 @@ rhel8.7/ext4-mballoc-skip-uninit-groups-cr0.patch
 rhel8.7/ext4-mballoc-prefetch.patch
 rhel8.3/ext4-xattr-disable-credits-check.patch
 base/ext4-no-max-dir-size-limit-for-iam-objects.patch
+rhel7.6/ext4-dquot-commit-speedup.patch
 rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch
 base/ext4-projid-xattrs.patch
 rhel8.5/ext4-enc-flag.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 38b97ff..a47ca55 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
@@ -26,6 +26,7 @@ rhel8.7/ext4-mballoc-skip-uninit-groups-cr0.patch
 rhel8.7/ext4-mballoc-prefetch.patch
 rhel8.3/ext4-xattr-disable-credits-check.patch
 base/ext4-no-max-dir-size-limit-for-iam-objects.patch
+rhel7.6/ext4-dquot-commit-speedup.patch
 rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch
 base/ext4-projid-xattrs.patch
 rhel8.5/ext4-enc-flag.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
index 20ec37e..1b90b80 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
@@ -24,6 +24,7 @@ linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch
 linux-5.14/export-ext4fs-dirhash-helper.patch
 linux-5.8/ext4-no-max-dir-size-limit-for-iam-objects.patch
+rhel9/ext4-dquot-commit-speedup.patch
 linux-5.14/ext4-ialloc-uid-gid-and-pass-owner-down.patch
 linux-5.14/ext4-projid-xattrs.patch
 rhel9.1/ext4-delayed-iput.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
index d738de5..2b43648 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
@@ -24,6 +24,7 @@ linux-5.14/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch
 linux-5.14/export-ext4fs-dirhash-helper.patch
 linux-5.8/ext4-no-max-dir-size-limit-for-iam-objects.patch
+rhel9/ext4-dquot-commit-speedup.patch
 linux-5.14/ext4-ialloc-uid-gid-and-pass-owner-down.patch
 linux-5.14/ext4-projid-xattrs.patch
 base/ext4-delayed-iput.patch