LU-6142 libcfs: discard PO2_ROUNDUP_TYPED, LOWEST_BIT_SET

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

diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index b0b3af9..9ef72e4 100644 (file)
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -36,8 +36,13 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/workqueue.h>
+#include <linux/sched.h>
+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#endif
 
 #include <libcfs/linux/linux-misc.h>
+#include <libcfs/linux/linux-mem.h>
 #include <libcfs/linux/linux-time.h>
 #include <libcfs/linux/linux-wait.h>
 
@@ -46,18 +51,13 @@
 #include <libcfs/libcfs_private.h>
 #include <libcfs/bitmap.h>
 #include <libcfs/libcfs_cpu.h>
-#include <libcfs/libcfs_prim.h>
 #include <libcfs/libcfs_string.h>
 #include <libcfs/libcfs_workitem.h>
 #include <libcfs/libcfs_hash.h>
-#include <libcfs/libcfs_heap.h>
 #include <libcfs/libcfs_fail.h>
 #include "curproc.h"
 
-#define LIBCFS_VERSION "0.5.0"
-
-#define PO2_ROUNDUP_TYPED(x, po2, type) (-(-(type)(x) & -(type)(po2)))
-#define LOWEST_BIT_SET(x) ((x) & ~((x) - 1))
+#define LIBCFS_VERSION "0.7.1"
 
 /* Sparse annotations */
 #if !defined(__must_hold)
@@ -68,15 +68,7 @@
 # endif /* !__CHECKER__ */
 #endif /* !__must_hold */
 
-#ifdef HAVE_TOTALRAM_PAGES_AS_FUNC
- #ifndef cfs_totalram_pages
-  #define cfs_totalram_pages() totalram_pages()
- #endif
-#else
- #ifndef cfs_totalram_pages
-  #define cfs_totalram_pages() totalram_pages
- #endif
-#endif
+typedef s32 timeout_t;
 
 /* need both kernel and user-land acceptor */
 #define LNET_ACCEPTOR_MIN_RESERVED_PORT    512
@@ -90,40 +82,7 @@ static inline int notifier_from_ioctl_errno(int err)
        return notifier_from_errno(err) | NOTIFY_STOP_MASK;
 }
 
-/*
- * Defined by platform
- */
-int unshare_fs_struct(void);
-sigset_t cfs_block_allsigs(void);
-sigset_t cfs_block_sigs(unsigned long sigs);
-sigset_t cfs_block_sigsinv(unsigned long sigs);
-void cfs_restore_sigs(sigset_t);
-void cfs_clear_sigpending(void);
-
-/*
- * Random number handling
- */
-
-/* returns a random 32-bit integer */
-unsigned int cfs_rand(void);
-/* seed the generator */
-void cfs_srand(unsigned int, unsigned int);
-void cfs_get_random_bytes(void *buf, int size);
-
 int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);
-int libcfs_ioctl(unsigned long cmd, void __user *uparam);
-
-/* container_of depends on "likely" which is defined in libcfs_private.h */
-static inline void *__container_of(const void *ptr, unsigned long shift)
-{
-       if (unlikely(IS_ERR(ptr) || ptr == NULL))
-               return ERR_CAST(ptr);
-       else
-               return (char *)ptr - shift;
-}
-
-#define container_of0(ptr, type, member) \
-       ((type *)__container_of((ptr), offsetof(type, member)))
 
 extern struct workqueue_struct *cfs_rehash_wq;
 
@@ -141,4 +100,32 @@ int lprocfs_call_handler(void *data, int write, loff_t *ppos,
                         int (*handler)(void *data, int write, loff_t pos,
                                        void __user *buffer, int len));
 
+/*
+ * Memory
+ */
+#if BITS_PER_LONG == 32
+/* limit to lowmem on 32-bit systems */
+#define NUM_CACHEPAGES \
+       min(cfs_totalram_pages(), 1UL << (30 - PAGE_SHIFT) * 3 / 4)
+#else
+#define NUM_CACHEPAGES cfs_totalram_pages()
+#endif
+
+#define wait_var_event_warning(var, condition, format, ...)            \
+do {                                                                   \
+       int counter = 4;                                                \
+       might_sleep();                                                  \
+       if (condition)                                                  \
+               break;                                                  \
+       ___wait_var_event(var, condition, TASK_UNINTERRUPTIBLE, 0, 0,   \
+                         if (schedule_timeout(cfs_time_seconds(1)) == 0)\
+                                 CDEBUG(is_power_of_2(counter++) ?     \
+                                        D_WARNING : D_NET,             \
+                                        format, ## __VA_ARGS__)        \
+               );                                                      \
+} while (0)
+
+/* atomic-context safe vfree */
+void libcfs_vfree_atomic(const void *addr);
+
 #endif /* _LIBCFS_LIBCFS_H_ */