File 0007-LU-12477-lustre-remove-obsolete-config-che... of Package lustre_2_12

Overview Repositories Revisions Requests Users Attributes Meta

File 0007-LU-12477-lustre-remove-obsolete-config-checks.patch of Package lustre_2_12

From e991f2da92f19482d6ba935534e18900a54dca51 Mon Sep 17 00:00:00 2001
From: James Simmons <jsimmons@infradead.org>
Date: Sat, 8 Feb 2020 08:39:30 -0500
Subject: [PATCH 07/35] LU-12477 lustre: remove obsolete config checks

THIS IS A VERY LIMITED BACKPORT OF THIS PATCH.

Remove from the lustre kernel code all the support for kernels
earlier than the RHEL7 3.10+. This greatly simplifies the code
and makes build times much better.

Change-Id: If52091ac5249b2719b992032040ccf30cc5bf0e4
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/37085
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/autoconf/lustre-core.m4 |  4 ++--
 lustre/llite/file.c            | 34 +---------------------------------
 lustre/llite/llite_internal.h  |  2 +-
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0bbab60d9a30..f1c1c5bc5480 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -377,7 +377,7 @@ inode_ops_permission_2args, [
 ],[
 	struct inode *inode __attribute__ ((unused));
 
-	inode = NULL;
+	inode = "no";
 	inode->i_op->permission(NULL, 0);
 ],[
 	AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1,
@@ -799,7 +799,7 @@ LB_CHECK_COMPILE([if 'inode_owner_or_capable' exist],
 inode_owner_or_capable, [
 	#include <linux/fs.h>
 ],[
-	inode_owner_or_capable(NULL);
+	;
 ],[
 	AC_DEFINE(HAVE_INODE_OWNER_OR_CAPABLE, 1,
 		[inode_owner_or_capable exist])
diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 22b09065f90f..20b986865628 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -4677,45 +4677,13 @@ out:
 #endif /* CONFIG_FS_POSIX_ACL */
 #endif /* HAVE_IOP_SET_ACL */
 
-#ifndef HAVE_GENERIC_PERMISSION_2ARGS
-static int
-# ifdef HAVE_GENERIC_PERMISSION_4ARGS
-ll_check_acl(struct inode *inode, int mask, unsigned int flags)
-# else
-ll_check_acl(struct inode *inode, int mask)
-# endif
-{
-# ifdef CONFIG_FS_POSIX_ACL
-	struct posix_acl *acl;
-	int rc;
-	ENTRY;
-
-#  ifdef HAVE_GENERIC_PERMISSION_4ARGS
-	if (flags & IPERM_FLAG_RCU)
-		return -ECHILD;
-#  endif
-	acl = ll_get_acl(inode, ACL_TYPE_ACCESS);
-
-	if (!acl)
-		RETURN(-EAGAIN);
-
-	rc = posix_acl_permission(inode, acl, mask);
-	posix_acl_release(acl);
-
-	RETURN(rc);
-# else /* !CONFIG_FS_POSIX_ACL */
-	return -EAGAIN;
-# endif /* CONFIG_FS_POSIX_ACL */
-}
-#endif /* HAVE_GENERIC_PERMISSION_2ARGS */
-
 #ifdef HAVE_GENERIC_PERMISSION_4ARGS
 int ll_inode_permission(struct inode *inode, int mask, unsigned int flags)
 #else
 # ifdef HAVE_INODE_PERMISION_2ARGS
 int ll_inode_permission(struct inode *inode, int mask)
 # else
-int ll_inode_permission(struct inode *inode, int mask, struct nameidata *nd)
+int ll_inode_permission(struct inode *inode, int mask)
 # endif
 #endif
 {
diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 4bfa305dc5b3..113d492c9bcf 100644
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -889,7 +889,7 @@ int ll_get_fid_by_name(struct inode *parent, const char *name,
 int ll_inode_permission(struct inode *inode, int mask, unsigned int flags);
 #else
 # ifndef HAVE_INODE_PERMISION_2ARGS
-int ll_inode_permission(struct inode *inode, int mask, struct nameidata *nd);
+int ll_inode_permission(struct inode *inode, int mask);
 # else
 int ll_inode_permission(struct inode *inode, int mask);
 # endif
-- 
2.41.0

Places

File 0007-LU-12477-lustre-remove-obsolete-config-checks.patch of Package lustre_2_12

Places