LU-14776 ldiskfs: support Ubuntu 5.8.0-63

Handle small changes in ext4 for Ubuntu 5.8.0-63 release.

Change-Id: Ie81b64909a49e66af17b4dfc1b8fbaf538f9f29e
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/45794
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 2ce5684..9e2cc33 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -118,7 +118,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        ],
        [LDISKFS_SERIES="5.4.0-ml.series"])],
        [LDISKFS_SERIES="5.8.0-53-ubuntu20.series"],
-       [LDISKFS_SERIES="5.8.0-53-ubuntu20.series"],
+       [LDISKFS_SERIES="5.8.0-63-ubuntu20.series"],
        [LDISKFS_SERIES="5.8.0-ml.series"])
 ])
 ])

diff --git a/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-xattr-disable-credits-check.patch b/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-xattr-disable-credits-check.patch
new file mode 100644 (file)
index 0000000..64d7d80
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ubuntu2004/ext4-xattr-disable-credits-check.patch
@@ -0,0 +1,14 @@
+diff -ur a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+--- a/fs/ext4/xattr.c  2021-12-04 15:34:36.356774600 -0700
++++ b/fs/ext4/xattr.c  2021-12-04 15:46:25.813868672 -0700
+@@ -2325,10 +2325,6 @@
+                                                  flags & XATTR_CREATE);
+               brelse(bh);
+ 
+-              if (jbd2_handle_buffer_credits(handle) < credits) {
+-                      error = -ENOSPC;
+-                      goto cleanup;
+-              }
+               WARN_ON_ONCE(!(current->flags & PF_MEMALLOC_NOFS));
+       }
+ 

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series
new file mode 100644 (file)
index 0000000..c60c85f
--- /dev/null
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series
@@ -0,0 +1,31 @@
+rhel8/ext4-inode-version.patch
+linux-5.4/ext4-lookup-dotdot.patch
+suse15/ext4-print-inum-in-htree-warning.patch
+linux-5.8/ext4-prealloc.patch
+ubuntu18/ext4-osd-iop-common.patch
+linux-5.8/ext4-misc.patch
+linux-5.8/ext4-mballoc-extra-checks.patch
+linux-5.4/ext4-hash-indexed-dir-dotdot-update.patch
+linux-5.8/ext4-kill-dx-root.patch
+linux-5.8/ext4-mballoc-pa-free-mismatch.patch
+linux-5.8/ext4-data-in-dirent.patch
+rhel8/ext4-nocmtime.patch
+base/ext4-htree-lock.patch
+ubuntu2004/ext4-pdirop.patch
+linux-5.8/ext4-max-dir-size.patch
+linux-5.8/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
+linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
+ubuntu18/ext4-jcb-optimization.patch
+linux-5.4/ext4-attach-jinode-in-writepages.patch
+rhel8/ext4-dont-check-before-replay.patch
+rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+rhel7.6/ext4-export-orphan-add.patch
+linux-5.8/ext4-export-mb-stream-allocator-variables.patch
+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
+ubuntu2004/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
+linux-5.8/ext4-enc-flag.patch