From 2907eb63d98a81384d79cd713b571fd311d9d474 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin <dmitry.eremin@intel.com>
Date: Fri, 11 Sep 2015 23:10:37 -0500
Subject: [PATCH] LU-7244 llite: Fix XATTR_NAME_EVM redefinition

In Linux kernel version 3.2.x the defintion of XATTR_NAME_EVM exist
but defintion XATTR_NAME_IMA is not. So, check them independently.

Change-Id: Ib98534d278ae4d5eaaa86538beb9bf683b9cf807
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: http://review.whamcloud.com/16707
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre/llite/xattr.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 89bda2a..6abacbc 100644
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -37,6 +37,7 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/xattr.h>
 #include <linux/selinux.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
@@ -48,6 +49,14 @@
 
 #include "llite_internal.h"
 
+/* xattr related to IMA(Integrity Measurement Architecture) */
+#ifndef XATTR_NAME_IMA
+#define XATTR_NAME_IMA		"security.ima"
+#endif
+#ifndef XATTR_NAME_EVM
+#define XATTR_NAME_EVM		"security.evm"
+#endif
+
 #define XATTR_USER_T            (1)
 #define XATTR_TRUSTED_T         (2)
 #define XATTR_SECURITY_T        (3)
@@ -102,12 +111,6 @@ int xattr_type_filter(struct ll_sb_info *sbi, int xattr_type)
         return 0;
 }
 
-/* xattr related to IMA(Integrity Measurement Architecture) */
-#ifndef XATTR_NAME_IMA
-#define XATTR_NAME_IMA		"security.ima"
-#define XATTR_NAME_EVM		"security.evm"
-#endif
-
 static
 int ll_setxattr_common(struct inode *inode, const char *name,
 		       const void *value, size_t size,
-- 
1.8.3.1