LU-16883 ldiskfs: update for ext4-delayed-iput for RHEL9.0

ext4-delayed-iput patch does not apply cleanly to RHEL9.0

Adjust the minor conflict in ext4_put_super()

Test-Parameters: trivial
Fixes: 616fa9b581 ("LU-15404 ldiskfs: use per-filesystem workqueues to avoid deadlocks")
HPE-bug-id: LUS-11661
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Ia8c2dcda50417b113399973f177a14283514a1ff
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51376
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
index 7f3244f..6c5501d 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
@@ -27,7 +27,7 @@ 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
+rhel9.1/ext4-delayed-iput.patch
 linux-5.14/ext4-xattr-disable-credits-check.patch
 linux-5.10/ext4-fiemap-kernel-data.patch
 rhel8/ext4-old_ea_inodes_handling_fix.patch