LU-5396: use gfp_t for gfp mask, instead of (unsigned) int

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

diff --git a/libcfs/include/libcfs/linux/linux-prim.h b/libcfs/include/libcfs/linux/linux-prim.h
index e099dc3..4c27905 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-prim.h
+++ b/libcfs/include/libcfs/linux/linux-prim.h
@@ -62,7 +62,10 @@
 #ifdef HAVE_LINUX_RANDOM_H
 #include <linux/random.h>
 #endif
-
+#ifdef HAVE_UIDGID_HEADER
+#include <linux/uidgid.h>
+#endif
+#include <linux/user_namespace.h>
 #include <linux/miscdevice.h>
 #include <libcfs/linux/portals_compat25.h>
 #include <asm/div64.h>
@@ -87,8 +90,6 @@
 static int                                              \
 LL_PROC_PROTO(name)                                     \
 {                                                       \
-        DECLARE_LL_PROC_PPOS_DECL;                      \
-                                                        \
         return proc_call_handler(table->data, write,    \
                                  ppos, buffer, lenp,    \
                                  __##name);             \
@@ -97,8 +98,6 @@ LL_PROC_PROTO(name)                                     \
 /*
  * Proc file system APIs
  */
-typedef read_proc_t                     cfs_read_proc_t;
-typedef write_proc_t                    cfs_write_proc_t;
 typedef struct proc_dir_entry           cfs_proc_dir_entry_t;
 #define cfs_create_proc_entry(n, m, p)  create_proc_entry(n, m, p)
 #define cfs_free_proc_entry(e)          free_proc_entry(e)
@@ -174,61 +173,4 @@ static inline void __add_wait_queue_exclusive(wait_queue_head_t *q,
         module_init(init);                    \
         module_exit(fini)
 
-/*
- * atomic
- */
-
-typedef atomic_t cfs_atomic_t;
-
-#define cfs_atomic_read(atom)                atomic_read(atom)
-#define cfs_atomic_inc(atom)                 atomic_inc(atom)
-#define cfs_atomic_inc_and_test(atom)        atomic_inc_and_test(atom)
-#define cfs_atomic_inc_return(atom)          atomic_inc_return(atom)
-#define cfs_atomic_inc_not_zero(atom)        atomic_inc_not_zero(atom)
-#define cfs_atomic_add_unless(atom, a, u)    atomic_add_unless(atom, a, u)
-#define cfs_atomic_dec(atom)                 atomic_dec(atom)
-#define cfs_atomic_dec_and_test(atom)        atomic_dec_and_test(atom)
-#define cfs_atomic_dec_and_lock(atom, lock)  atomic_dec_and_lock(atom, lock)
-#define cfs_atomic_dec_return(atom)          atomic_dec_return(atom)
-#define cfs_atomic_set(atom, value)          atomic_set(atom, value)
-#define cfs_atomic_add(value, atom)          atomic_add(value, atom)
-#define cfs_atomic_add_return(value, atom)   atomic_add_return(value, atom)
-#define cfs_atomic_sub(value, atom)          atomic_sub(value, atom)
-#define cfs_atomic_sub_and_test(value, atom) atomic_sub_and_test(value, atom)
-#define cfs_atomic_sub_return(value, atom)   atomic_sub_return(value, atom)
-#define cfs_atomic_cmpxchg(atom, old, nv)    atomic_cmpxchg(atom, old, nv)
-#define CFS_ATOMIC_INIT(i)                   ATOMIC_INIT(i)
-
-/*
- * membar
- */
-
-#define cfs_mb() mb()
-
-/*
- * interrupt
- */
-
-#define cfs_in_interrupt() in_interrupt()
-
-/*
- * might_sleep
- */
-#define cfs_might_sleep() might_sleep()
-
-/*
- * group_info
- */
-typedef struct group_info cfs_group_info_t;
-
-#define cfs_get_group_info(group_info)     get_group_info(group_info)
-#define cfs_put_group_info(group_info)     put_group_info(group_info)
-#define cfs_set_current_groups(group_info) set_current_groups(group_info)
-#define cfs_groups_free(group_info)        groups_free(group_info)
-#define cfs_groups_alloc(gidsetsize)       groups_alloc(gidsetsize)
-
-/*
- * Random bytes
- */
-#define cfs_get_random_bytes_prim(buf, nbytes)  get_random_bytes(buf, nbytes)
 #endif