From: John L. Hammond <john.hammond@intel.com>
Date: Thu, 5 Nov 2015 17:20:37 +0000 (-0600)
Subject: LU-7394 obd: remove HAVE_SELINUX_IS_ENABLED
X-Git-Tag: 2.7.65~62
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=6506cd4e25105865b79c6de474dbbbfbc853b0d6;p=fs%2Flustre-release.git

LU-7394 obd: remove HAVE_SELINUX_IS_ENABLED

In obd_mount_server.c unconditionally include linux/selinux.h. Include
linux/selinux.h in xattr_security.c.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Iea7a64d4e66d4c78494da40642111085b95700f9
Reviewed-on: http://review.whamcloud.com/17054
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/llite/xattr_security.c b/lustre/llite/xattr_security.c
index 04471791..4cb17b5 100644
--- a/lustre/llite/xattr_security.c
+++ b/lustre/llite/xattr_security.c
@@ -31,6 +31,7 @@
 
 
 #include <linux/security.h>
+#include <linux/selinux.h>
 #include <linux/xattr.h>
 #include "llite_internal.h"
 
diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 7f2e33a..4452f05 100644
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -46,6 +46,8 @@
 #define PRINT_CMD CDEBUG
 #define PRINT_MASK (D_SUPER | D_CONFIG)
 
+#include <linux/types.h>
+#include <linux/selinux.h>
 #include <linux/statfs.h>
 #include <obd.h>
 #include <obd_class.h>
@@ -58,9 +60,6 @@
 #ifdef HAVE_KERNEL_LOCKED
 #include <linux/smp_lock.h>
 #endif
-#ifdef HAVE_SELINUX_IS_ENABLED
-#include <linux/selinux.h>
-#endif
 
 /*********** mount lookup *********/