LU-4961 lustre: remove liblustre.h and obd.h from userspace

[fs/lustre-release.git] / libcfs / include / libcfs / user-prim.h

diff --git a/libcfs/include/libcfs/user-prim.h b/libcfs/include/libcfs/user-prim.h
index ab2671e..ceef624 100644 (file)
--- a/libcfs/include/libcfs/user-prim.h
+++ b/libcfs/include/libcfs/user-prim.h
@@ -55,8 +55,6 @@
 # define EXPORT_SYMBOL(s)
 #endif
 
-#ifndef __KERNEL__
-
 typedef struct proc_dir_entry           cfs_proc_dir_entry_t;
 
 /*
@@ -89,12 +87,12 @@ typedef struct proc_dir_entry           cfs_proc_dir_entry_t;
  */
 
 typedef struct cfs_waitlink {
-        cfs_list_t sleeping;
-        void *process;
+       struct list_head sleeping;
+       void *process;
 } wait_queue_t;
 
 typedef struct cfs_waitq {
-        cfs_list_t sleepers;
+       struct list_head sleepers;
 } wait_queue_head_t;
 
 #define CFS_DECL_WAITQ(wq) wait_queue_head_t wq
@@ -124,6 +122,9 @@ void cond_resched(void);
 
 static inline void schedule(void)                      {}
 static inline void schedule_timeout(int64_t t) {}
+static inline void set_current_state(int state)
+{
+}
 
 /*
  * Lproc
@@ -144,7 +145,7 @@ typedef int (write_proc_t)(struct file *file, const char *buffer,
  */
 
 struct timer_list {
-       cfs_list_t tl_list;
+       struct list_head tl_list;
        void (*function)(ulong_ptr_t unused);
        ulong_ptr_t data;
        long expires;
@@ -166,7 +167,6 @@ static inline int misc_deregister(struct miscdevice *foo)
        return 0;
 }
 
-#define cfs_sigfillset(l)               do {} while (0)
 #define cfs_recalc_sigpending(l)        do {} while (0)
 
 #define DAEMON_FLAGS                0
@@ -264,8 +264,6 @@ static inline void libcfs_arch_cleanup(void) {
 /* !__WINNT__ */
 #endif
 
-/* !__KERNEL__ */
-#endif
 
 /* __LIBCFS_USER_PRIM_H__ */
 #endif