From: John L. Hammond <john.hammond@intel.com>
Date: Wed, 30 Apr 2014 20:40:02 +0000 (-0500)
Subject: LU-2675 fid: remove liblustre includes
X-Git-Tag: 2.5.60~76
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c0a8fa3749834fa1e6f148ffec8b58ea578c1af4

LU-2675 fid: remove liblustre includes

In lustre/fid/ remove includes for liblustre builds.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I609f8ad09ac4ea59fd48b5a7cb1d29c96d0359c9
Reviewed-on: http://review.whamcloud.com/10169
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/fid/autoMakefile.am b/lustre/fid/autoMakefile.am
index b4c590e..db183fa 100644
--- a/lustre/fid/autoMakefile.am
+++ b/lustre/fid/autoMakefile.am
@@ -34,13 +34,6 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-if LIBLUSTRE
-noinst_LIBRARIES = libfid.a
-libfid_a_SOURCES = fid_request.c fid_internal.h
-libfid_a_CPPFLAGS = $(LLCPPFLAGS)
-libfid_a_CFLAGS = $(LLCFLAGS)
-endif
-
 if MODULES
 modulefs_DATA = fid$(KMODEXT)
 endif
diff --git a/lustre/fid/fid_internal.h b/lustre/fid/fid_internal.h
index 88eda41..f8539d8 100644
--- a/lustre/fid/fid_internal.h
+++ b/lustre/fid/fid_internal.h
@@ -43,9 +43,8 @@
 #include <lustre/lustre_idl.h>
 #include <libcfs/libcfs.h>
 
-#ifdef __KERNEL__
-# ifdef HAVE_SERVER_SUPPORT
-#  define HAVE_SEQ_SERVER
+#ifdef HAVE_SERVER_SUPPORT
+# define HAVE_SEQ_SERVER
 
 struct req_capsule;
 
@@ -61,9 +60,9 @@ enum {
 
 extern struct lu_context_key seq_thread_key;
 
-#  ifdef LPROCFS
+# ifdef LPROCFS
 extern struct lprocfs_seq_vars seq_server_proc_list[];
-#  endif
+# endif
 
 /* Store API functions. */
 struct dt_device;
@@ -99,8 +98,6 @@ int seq_client_alloc_super(struct lu_client_seq *seq,
 extern struct lprocfs_seq_vars seq_client_proc_list[];
 # endif
 
-#endif /* __KERNEL__ */
-
 extern struct proc_dir_entry *seq_type_proc_dir;
 
 #endif /* __FID_INTERNAL_H */
diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 14de931..3d8a401 100644
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -42,13 +42,8 @@
 
 #define DEBUG_SUBSYSTEM S_FID
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
+#include <linux/module.h>
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
@@ -575,7 +570,6 @@ int client_fid_fini(struct obd_device *obd)
 }
 EXPORT_SYMBOL(client_fid_fini);
 
-#ifdef __KERNEL__
 struct proc_dir_entry *seq_type_proc_dir;
 
 static int __init fid_mod_init(void)
@@ -610,4 +604,3 @@ MODULE_DESCRIPTION("Lustre FID Module");
 MODULE_LICENSE("GPL");
 
 cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
-#endif /* __KERNEL__ */