LU-4993 libcfs: convert nodemask_t to linux bitmask

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

diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h
index ee5f1da..4afb764 100644 (file)
--- a/libcfs/include/libcfs/libcfs_private.h
+++ b/libcfs/include/libcfs/libcfs_private.h
@@ -320,6 +320,8 @@ int libcfs_debug_cleanup(void);
 /* !__KERNEL__ */
 #endif
 
+struct cfs_cpt_table;
+
 /*
  * allocate per-cpu-partition data, returned value is an array of pointers,
  * variable can be indexed by CPU ID.
@@ -474,11 +476,7 @@ struct cfs_percpt_lock {
 };
 
 /* return number of private locks */
-static inline int
-cfs_percpt_lock_num(struct cfs_percpt_lock *pcl)
-{
-       return cfs_cpt_number(pcl->pcl_cptab);
-}
+#define cfs_percpt_lock_num(pcl)       cfs_cpt_number(pcl->pcl_cptab)
 
 #else /* !__KERNEL__ */
 
@@ -534,7 +532,7 @@ int cfs_percpt_atomic_summary(atomic_t **refs);
  *       value  after  conversion...
  *
  */
-#define CLASSERT(cond) do {switch(42) {case (cond): case 0: break;}} while (0)
+#define CLASSERT(cond) do {switch (1) {case (cond): case 0: break; } } while (0)
 
 /* support decl needed both by kernel and liblustre */
 int             libcfs_isknown_lnd(int type);
@@ -662,15 +660,6 @@ do {                                                            \
         ptr += cfs_size_round(len);                             \
 } while (0)
 
-#define LOGL0(var,len,ptr)                              \
-do {                                                    \
-        if (!len)                                       \
-                break;                                  \
-        memcpy((char *)ptr, (const char *)var, len);    \
-        *((char *)(ptr) + len) = 0;                     \
-        ptr += cfs_size_round(len + 1);                 \
-} while (0)
-
 /**
  *  Lustre Network Driver types.
  */