LU-2675 build: assume __linux__ and __KERNEL__

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 12784c9..0154671 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -36,9 +36,6 @@
 #ifndef __CLASS_OBD_H
 #define __CLASS_OBD_H
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_import.h>
@@ -48,11 +45,7 @@
 #include <lustre/lustre_idl.h>
 #include <lprocfs_status.h>
 
-#if defined(__linux__)
 #include <linux/obd_class.h>
-#else
-#error Unsupported operating system.
-#endif
 
 #define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
                                          * and resends for avoid deadlocks */
@@ -1943,10 +1936,6 @@ struct root_squash_info {
        struct rw_semaphore     rsi_sem;
 };
 
-#ifdef __KERNEL__
 int server_name2index(const char *svname, __u32 *idx, const char **endptr);
-#else
-# define server_name2index(name, idx, ptr)     do {} while (0)
-#endif
 
 #endif /* __LINUX_OBD_CLASS_H */