LU-14651 build: fix build for el7.9 kernels

Handle extra setattr_prepare() argument added in Linux 5.12 kernels
when building on older kernels.

Lustre-change: https://review.whamcloud.com/53503
Lustre-commit: TBD (from cc03199c61df217f7da249d9f9f3419e0333c671)

HPE-bug-id: LUS-12059
Signed-off-by: Andrew Perepechko <andrew.perepechko@hpe.com>
Change-Id: Ie7fd1c4d51b7a9b086cfca0db941321cbcce7057
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53494
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 20eb4be..98d9b86 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -299,11 +299,16 @@ struct ll_inode_info {
 #define inode_permission(ns, inode, mask)      inode_permission(inode, mask)
 #define generic_permission(ns, inode, mask)    generic_permission(inode, mask)
 #define simple_setattr(ns, de, iattr)          simple_setattr(de, iattr)
+#define ll_setattr(ns, de, attr)               ll_setattr(de, attr)
+#ifdef HAVE_STRUCT_POSIX_ACL_XATTR
+#define setattr_prepare(ns, de, at)            setattr_prepare(de, at)
+#else
+#define setattr_prepare(ns, de, at)            inode_change_ok(de->d_inode, at)
+#endif
 #define ll_inode_permission(ns, inode, mask)   ll_inode_permission(inode, mask)
 #ifdef HAVE_INODEOPS_ENHANCED_GETATTR
 #define ll_getattr(ns, path, stat, mask, fl)   ll_getattr(path, stat, mask, fl)
 #endif /* HAVE_INODEOPS_ENHANCED_GETATTR */
-#define ll_setattr(ns, de, attr)               ll_setattr(de, attr)
 #endif
 
 static inline void ll_trunc_sem_init(struct ll_trunc_sem *sem)

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index f0598ee..f2cef2b 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -2351,6 +2351,10 @@ int ll_setattr(struct mnt_idmap *map, struct dentry *de, struct iattr *attr)
        enum op_xvalid xvalid = 0;
        int rc;
 
+       rc = setattr_prepare(map, de, attr);
+       if (rc)
+               return rc;
+
        rc = llcrypt_prepare_setattr(de, attr);
        if (rc)
                return rc;