From: John L. Hammond <john.hammond@intel.com>
Date: Fri, 1 Aug 2014 16:12:41 +0000 (-0500)
Subject: LU-5442 lustre: always include libcfs.h in lustre_idl.h
X-Git-Tag: 2.6.51~28
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ce316f15fb2f37cfd0385a363e776c92630be7a3;p=fs%2Flustre-release.git

LU-5442 lustre: always include libcfs.h in lustre_idl.h

Unconditionally include libcfs.h in lustre_idl.h. Since the landing of
LU-5327 libcfs: add libcfs/types.h it is possible to get definitions
for LPU64 without including libcfs.h. (Technically it was always
possible, but now it's much easier.)  The outer include guard was
added in LU-113: make lustre_{idl,user}.h nice to userspace. Since we
no longer package lustre_idl.h we remove this guard.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I55a453669fcd821f974d6f69ebc741595984d98d
Reviewed-on: http://review.whamcloud.com/11308
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ba64fd0..dcd9923 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -91,13 +91,8 @@
 #ifndef _LUSTRE_IDL_H_
 #define _LUSTRE_IDL_H_
 
-#if !defined(LPU64)
 #include <libcfs/libcfs.h> /* for LPUX64, etc */
-#endif
-
-/* Defn's shared with user-space. */
-#include <lustre/lustre_user.h>
-
+#include <lustre/lustre_user.h> /* Defn's shared with user-space. */
 #include <lustre/lustre_errno.h>
 #include <lustre_ver.h>