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

[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 8245c5b..63b5b92 100644 (file)
--- a/libcfs/include/libcfs/libcfs_private.h
+++ b/libcfs/include/libcfs/libcfs_private.h
@@ -42,9 +42,6 @@
 #ifndef __LIBCFS_PRIVATE_H__
 #define __LIBCFS_PRIVATE_H__
 
-/* XXX this layering violation is for nidstrings */
-#include <lnet/types.h>
-
 #ifndef DEBUG_SUBSYSTEM
 # define DEBUG_SUBSYSTEM S_UNDEFINED
 #endif
@@ -311,13 +308,8 @@ int libcfs_debug_cleanup(void);
  * build go below this comment. Actual compiler/compiler version
  * specific implementations come from the above header files
  */
-#ifdef __GNUC__
 #define likely(x)      __builtin_expect(!!(x), 1)
 #define unlikely(x)    __builtin_expect(!!(x), 0)
-#else
-#define likely(x)      (!!(x))
-#define unlikely(x)    (!!(x))
-#endif
 /* !__KERNEL__ */
 #endif
 
@@ -535,45 +527,6 @@ int cfs_percpt_atomic_summary(atomic_t **refs);
  */
 #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);
-char           *libcfs_lnd2modname(int type);
-char           *libcfs_lnd2str(int type);
-int             libcfs_str2lnd(const char *str);
-char           *libcfs_net2str(__u32 net);
-char           *libcfs_nid2str(lnet_nid_t nid);
-__u32           libcfs_str2net(const char *str);
-lnet_nid_t      libcfs_str2nid(const char *str);
-int             libcfs_str2anynid(lnet_nid_t *nid, const char *str);
-char           *libcfs_id2str(lnet_process_id_t id);
-void            cfs_free_nidlist(struct list_head *list);
-int             cfs_parse_nidlist(char *str, int len, struct list_head *list);
-int             cfs_print_nidlist(char *buffer, int count,
-                                  struct list_head *list);
-int             cfs_match_nid(lnet_nid_t nid, struct list_head *list);
-bool            cfs_nidrange_is_contiguous(struct list_head *nidlist);
-void            cfs_nidrange_find_min_max(struct list_head *nidlist,
-                                          char *min_nid, char *max_nid,
-                                          int nidstr_length);
-
-/** \addtogroup lnet_addr
- * @{ */
-/* how an LNET NID encodes net:address */
-/** extract the address part of an lnet_nid_t */
-#define LNET_NIDADDR(nid)      ((__u32)((nid) & 0xffffffff))
-/** extract the network part of an lnet_nid_t */
-#define LNET_NIDNET(nid)       ((__u32)(((nid) >> 32)) & 0xffffffff)
-/** make an lnet_nid_t from a network part and an address part */
-#define LNET_MKNID(net,addr)   ((((__u64)(net))<<32)|((__u64)(addr)))
-/* how net encodes type:number */
-#define LNET_NETNUM(net)       ((net) & 0xffff)
-#define LNET_NETTYP(net)       (((net) >> 16) & 0xffff)
-#define LNET_MKNET(typ,num)    ((((__u32)(typ))<<16)|((__u32)(num)))
-/** @} lnet_addr */
-
-/* max value for numeric network address */
-#define MAX_NUMERIC_VALUE 0xffffffff
-
 /* implication */
 #define ergo(a, b) (!(a) || (b))
 /* logical equivalence */
@@ -683,4 +636,11 @@ enum {
        GNIIPLND  = 14,
 };
 
+extern struct cfs_psdev_ops libcfs_psdev_ops;
+extern struct miscdevice libcfs_dev;
+extern struct cfs_wi_sched *cfs_sched_rehash;
+
+extern int insert_proc(void);
+extern void remove_proc(void);
+
 #endif