LU-5577 libcfs: fix warnings in libcfs/curproc.h

[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 f073ba5..9ec0e77 100644 (file)
--- a/libcfs/include/libcfs/user-prim.h
+++ b/libcfs/include/libcfs/user-prim.h
@@ -55,10 +55,6 @@
 # define EXPORT_SYMBOL(s)
 #endif
 
-#ifndef __KERNEL__
-
-typedef struct proc_dir_entry           cfs_proc_dir_entry_t;
-
 /*
  * Just present a single processor until will add thread support.
  */
@@ -71,17 +67,30 @@ typedef struct proc_dir_entry           cfs_proc_dir_entry_t;
 #ifndef num_possible_cpus
 # define num_possible_cpus() 1
 #endif
+#ifndef get_cpu
+# define get_cpu() 0
+#endif
+#ifndef put_cpu
+# define put_cpu() do {} while (0)
+#endif
+#ifndef NR_CPUS
+# define NR_CPUS 1
+#endif
+#ifndef for_each_possible_cpu
+# define for_each_possible_cpu(cpu) for ((cpu) = 0; (cpu) < 1; (cpu)++)
+#endif
+
 /*
  * Wait Queue.
  */
 
 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
@@ -111,15 +120,18 @@ 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
  */
-typedef int (cfs_read_proc_t)(char *page, char **start, off_t off,
-                          int count, int *eof, void *data);
+typedef int (read_proc_t)(char *page, char **start, off_t off,
+                               int count, int *eof, void *data);
 
 struct file; /* forward ref */
-typedef int (cfs_write_proc_t)(struct file *file, const char *buffer,
+typedef int (write_proc_t)(struct file *file, const char *buffer,
                                unsigned long count, void *data);
 
 /*
@@ -131,7 +143,7 @@ typedef int (cfs_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;
@@ -153,7 +165,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
@@ -225,43 +236,10 @@ struct group_info{ };
 #define get_random_bytes(val, size)     (*val) = 0
 
 /* utility libcfs init/fini entries */
-#ifdef __WINNT__
-extern int libcfs_arch_init(void);
-extern void libcfs_arch_cleanup(void);
-#else /* !__WINNT__ */
 static inline int libcfs_arch_init(void) {
         return 0;
 }
 static inline void libcfs_arch_cleanup(void) {
 }
-/* __WINNT__ */
-#endif
-
-/* proc interface wrappers for non-win OS */
-#ifndef __WINNT__
-#define cfs_proc_open   open
-#define cfs_proc_mknod  mknod
-#define cfs_proc_ioctl  ioctl
-#define cfs_proc_close  close
-#define cfs_proc_read   read
-#define cfs_proc_write  write
-#define cfs_proc_fopen  fopen
-#define cfs_proc_fclose fclose
-#define cfs_proc_fgets  fgets
-/* !__WINNT__ */
-#endif
-
-/* !__KERNEL__ */
-#endif
 
-/* __LIBCFS_USER_PRIM_H__ */
-#endif
-/*
- * Local variables:
- * c-indentation-style: "K&R"
- * c-basic-offset: 8
- * tab-width: 8
- * fill-column: 80
- * scroll-step: 1
- * End:
- */
+#endif /* __LIBCFS_USER_PRIM_H__ */