From: Oleg Drokin <oleg.drokin@intel.com>
Date: Sun, 22 May 2016 17:01:46 +0000 (-0400)
Subject: LU-8179 libcfs: Do not include libcfs/util/ioctl.h in kernel code
X-Git-Tag: 2.8.55~58
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0ecdb18ea46790a21f35f60d452e8fc7a50ce838

LU-8179 libcfs: Do not include libcfs/util/ioctl.h in kernel code

lustre/include/lustre_ioctl.h included libcfs/include/libcfs/util/ioctl.h
by mistake during kernel compiles, but it's strictly a user-space header
so move it into appropriate ifdef.

Test-Parameters: trivial
Change-Id: I598ef54ad2cf8bab9788eefe487adddeb73f90c1
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-on: http://review.whamcloud.com/20375
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
---

diff --git a/lustre/include/lustre_ioctl.h b/lustre/include/lustre_ioctl.h
index 2d51337..c004eb8 100644
--- a/lustre/include/lustre_ioctl.h
+++ b/lustre/include/lustre_ioctl.h
@@ -30,7 +30,6 @@
 
 #include <linux/types.h>
 #include <libcfs/libcfs.h>
-#include <libcfs/util/ioctl.h>
 #include <lustre/lustre_idl.h>
 
 #ifdef __KERNEL__
@@ -40,6 +39,7 @@
 #else /* __KERNEL__ */
 # include <malloc.h>
 # include <string.h>
+#include <libcfs/util/ioctl.h>
 #endif /* !__KERNEL__ */
 
 #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)