LU-2675 build: assume __linux__ and __KERNEL__

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

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 60dfe3f..2c7588c 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -41,25 +41,17 @@
 #error Do not #include this file directly. #include <obd_class.h> instead
 #endif
 
-#ifndef __KERNEL__
-#include <sys/types.h>
-#include <libcfs/list.h>
-#else
 #include <asm/uaccess.h>
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/timer.h>
-#endif
 
 /* obdo.c */
-#ifdef __KERNEL__
 void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid);
 void la_from_obdo(struct lu_attr *la, const struct obdo *dst, obd_flag valid);
 void obdo_refresh_inode(struct inode *dst, const struct obdo *src,
                        obd_flag valid);
 #define ll_inode_flags(inode)         (inode->i_flags)
-#endif
-
 
 #endif /* __LINUX_OBD_CLASS_H */