LU-1778 libcfs: add a service that prints a nidlist

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

diff --git a/libcfs/include/libcfs/libcfs_string.h b/libcfs/include/libcfs/libcfs_string.h
index e91396c..5afaec7 100644 (file)
--- a/libcfs/include/libcfs/libcfs_string.h
+++ b/libcfs/include/libcfs/libcfs_string.h
@@ -44,6 +44,7 @@
 #define __LIBCFS_STRING_H__
 
 /* libcfs_string.c */
+char *cfs_strrstr(const char *haystack, const char *needle);
 /* string comparison ignoring case */
 int cfs_strncasecmp(const char *s1, const char *s2, size_t n);
 /* Convert a text string to a bitmask */
@@ -79,15 +80,15 @@ struct cfs_range_expr {
        /*
         * Link to cfs_expr_list::el_exprs.
         */
-       cfs_list_t      re_link;
-       __u32           re_lo;
-       __u32           re_hi;
-       __u32           re_stride;
+       struct list_head        re_link;
+       __u32                   re_lo;
+       __u32                   re_hi;
+       __u32                   re_stride;
 };
 
 struct cfs_expr_list {
-       cfs_list_t      el_link;
-       cfs_list_t      el_exprs;
+       struct list_head        el_link;
+       struct list_head        el_exprs;
 };
 
 static inline int
@@ -112,6 +113,8 @@ int cfs_str2num_check(char *str, int nob, unsigned *num,
 int cfs_range_expr_parse(struct cfs_lstr *src, unsigned min, unsigned max,
                         int single_tok, struct cfs_range_expr **expr);
 int cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list);
+int cfs_expr_list_print(char *buffer, int count,
+                       struct cfs_expr_list *expr_list);
 int cfs_expr_list_values(struct cfs_expr_list *expr_list,
                         int max, __u32 **values);
 static inline void
@@ -124,13 +127,12 @@ cfs_expr_list_values_free(__u32 *values, int num)
 }
 
 void cfs_expr_list_free(struct cfs_expr_list *expr_list);
-void cfs_expr_list_print(struct cfs_expr_list *expr_list);
 int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
                        struct cfs_expr_list **elpp);
-void cfs_expr_list_free_list(cfs_list_t *list);
-int cfs_ip_addr_parse(char *str, int len, cfs_list_t *list);
-int cfs_ip_addr_match(__u32 addr, cfs_list_t *list);
-void cfs_ip_addr_free(cfs_list_t *list);
+void cfs_expr_list_free_list(struct list_head *list);
+int cfs_ip_addr_parse(char *str, int len, struct list_head *list);
+int cfs_ip_addr_match(__u32 addr, struct list_head *list);
+void cfs_ip_addr_free(struct list_head *list);
 
 #ifdef __KERNEL__
 #define        strtoul(str, endp, base)        simple_strtoul(str, endp, base)