From 580a22145ec16b548f5bdafa3a066686a95799b3 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Fri, 12 Nov 2021 23:24:05 +1100 Subject: [PATCH] LU-15083 ldiskfs: disable xattr credits check Add ext4-xattr-disable-credits-check.patch to the ldiskfs series from kernel 4.15+ except the rhel8 ones. They already have this fix. Change-Id: I1f9818c394377cdba6b11d2b24c26d2354f41ac0 Test-Parameters: trivial Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/45546 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Shuichi Ihara Tested-by: Oleg Drokin Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Oleg Drokin --- .../linux-5.4/ext4-xattr-disable-credits-check.patch | 15 +++++++++++++++ .../series/ldiskfs-4.15.0-20-ubuntu18.series | 3 ++- .../series/ldiskfs-4.15.0-24-ubuntu18.series | 1 + .../series/ldiskfs-5.0.0-13-ubuntu19.series | 1 + .../series/ldiskfs-5.4.0-42-ubuntu20.series | 1 + .../series/ldiskfs-5.4.0-66-ubuntu20.series | 1 + .../series/ldiskfs-5.4.0-80-ubuntu20.series | 1 + ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series | 1 + ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series | 1 + ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series | 1 + .../series/ldiskfs-5.8.0-53-ubuntu20.series | 1 + ldiskfs/kernel_patches/series/ldiskfs-5.8.0-ml.series | 1 + 12 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ldiskfs/kernel_patches/patches/linux-5.4/ext4-xattr-disable-credits-check.patch diff --git a/ldiskfs/kernel_patches/patches/linux-5.4/ext4-xattr-disable-credits-check.patch b/ldiskfs/kernel_patches/patches/linux-5.4/ext4-xattr-disable-credits-check.patch new file mode 100644 index 0000000..ae77d8a --- /dev/null +++ b/ldiskfs/kernel_patches/patches/linux-5.4/ext4-xattr-disable-credits-check.patch @@ -0,0 +1,15 @@ +Index: focal/fs/ext4/xattr.c +=================================================================== +--- focal.orig/fs/ext4/xattr.c ++++ focal/fs/ext4/xattr.c +@@ -2341,10 +2341,6 @@ ext4_xattr_set_handle(handle_t *handle, + flags & XATTR_CREATE); + brelse(bh); + +- if (!ext4_handle_has_enough_credits(handle, credits)) { +- error = -ENOSPC; +- goto cleanup; +- } + WARN_ON_ONCE(!(current->flags & PF_MEMALLOC_NOFS)); + } + diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series index ee17a3e..1c8f3c8 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series @@ -22,5 +22,6 @@ rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7.6/ext4-export-orphan-add.patch rhel7.6/ext4-mmp-dont-mark-bh-dirty.patch ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch -rhel7.7/ext4-ialloc-uid-gid-and-pass-owner-down.patch +rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series index e4800b8..325f762 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series @@ -23,5 +23,6 @@ rhel7.6/ext4-export-orphan-add.patch rhel7.6/ext4-mmp-dont-mark-bh-dirty.patch ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch suse15/ext4-export-mb-stream-allocator-variables.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series b/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series index 76cfc98..cfc1d66 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series @@ -23,5 +23,6 @@ rhel7.6/ext4-export-orphan-add.patch rhel8/ext4-export-mb-stream-allocator-variables.patch ubuntu19/ext4-iget-with-flags.patch rhel8/ext4-simple-blockalloc.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series index ca3f98f..25fb457 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch rhel8/ext4-simple-blockalloc.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series index f64d3d2..e2c88e2 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch rhel8/ext4-simple-blockalloc.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series index 7594d4c..a8eeb2f 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch linux-5.4/ext4-simple-blockalloc.patch +linux-5.4/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series index 0a71c7f..9eee135 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch rhel8/ext4-simple-blockalloc.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series index 57da6e1..6dad60c 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch linux-5.4/ext4-simple-blockalloc.patch +linux-5.4/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series index ca3f98f..25fb457 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch rhel8/ext4-simple-blockalloc.patch +rhel8/ext4-xattr-disable-credits-check.patch base/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series index 763129f..f4ef984 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch ubuntu2004/ext4-simple-blockalloc.patch +rhel8.3/ext4-xattr-disable-credits-check.patch linux-5.8/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-ml.series index cd6de77..c09e847 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-ml.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-ml.series @@ -25,5 +25,6 @@ ubuntu19/ext4-iget-with-flags.patch linux-5.4/export-ext4fs-dirhash-helper.patch linux-5.4/ext4-misc.patch linux-5.8/ext4-simple-blockalloc.patch +rhel8.3/ext4-xattr-disable-credits-check.patch linux-5.8/ext4-no-max-dir-size-limit-for-iam-objects.patch rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch -- 1.8.3.1