LU-12056 ldiskfs: add ext4-projid-xattrs.patch for Linux 5.10

ext4-projid-xattrs.patch was missed during the landing/review
process for ldiskfs-5.10.0-ml.series.
We also need a small change in base/ext4-projid-xattrs.patch to
make it apply on v5.10.

Change-Id: I2b7a6c957bd8b40cf78dbd9f4680b722e8d4418a
Test-Parameters: trivial
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/46295
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/base/ext4-projid-xattrs.patch b/ldiskfs/kernel_patches/patches/base/ext4-projid-xattrs.patch
index 95dbbf6..03527fd 100644 (file)
--- a/ldiskfs/kernel_patches/patches/base/ext4-projid-xattrs.patch
+++ b/ldiskfs/kernel_patches/patches/base/ext4-projid-xattrs.patch
@@ -2,14 +2,14 @@ Index: linux-4.18.0-348.2.1.el8_5/fs/ext4/ext4.h
 ===================================================================
 --- linux-4.18.0-348.2.1.el8_5.orig/fs/ext4/ext4.h
 +++ linux-4.18.0-348.2.1.el8_5/fs/ext4/ext4.h
-@@ -2770,6 +2770,7 @@ extern int ext4_ind_remove_space(handle_
+@@ -2768,6 +2768,7 @@ extern int ext4_ind_remove_space(handle_
+                                ext4_lblk_t start, ext4_lblk_t end);
+ 
  /* ioctl.c */
++extern int ext4_ioctl_setproject(struct inode *, __u32);
  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
  extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);
-+extern int ext4_ioctl_setproject(struct inode *, __u32);
  
- /* migrate.c */
- extern int ext4_ext_migrate(struct inode *);
 Index: linux-4.18.0-348.2.1.el8_5/fs/ext4/ioctl.c
 ===================================================================
 --- linux-4.18.0-348.2.1.el8_5.orig/fs/ext4/ioctl.c

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
index 0331faa..74d865d 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
@@ -27,4 +27,5 @@ linux-5.9/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
+base/ext4-projid-xattrs.patch
 linux-5.8/ext4-enc-flag.patch