X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flibcfs_string.c;h=be26f93c37fa7ebedc46c4b12de5bd4773e69115;hb=e02e613f411d4273c9c1c99ee88121e641ddb4c2;hp=cd7ef4914f9cc3cac29e5254ec831b25b64d7db2;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/libcfs_string.c b/libcfs/libcfs/libcfs_string.c
index cd7ef49..be26f93 100644
--- a/libcfs/libcfs/libcfs_string.c
+++ b/libcfs/libcfs/libcfs_string.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,7 +43,7 @@
 #include <libcfs/libcfs.h>
 
 /* non-0 = don't match */
-static int cfs_strncasecmp(const char *s1, const char *s2, size_t n)
+int cfs_strncasecmp(const char *s1, const char *s2, size_t n)
 {
         if (s1 == NULL || s2 == NULL)
                 return 1;
@@ -60,6 +60,7 @@ static int cfs_strncasecmp(const char *s1, const char *s2, size_t n)
 
         return tolower(*(unsigned char *)s1) - tolower(*(unsigned char *)s2);
 }
+EXPORT_SYMBOL(cfs_strncasecmp);
 
 /* Convert a text string to a bitmask */
 int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
@@ -139,7 +140,7 @@ char *cfs_strdup(const char *str, u_int32_t flags)
 
         lenz = strlen(str) + 1;
 
-        dup_str = cfs_alloc(lenz, flags);
+	dup_str = kmalloc(lenz, flags);
         if (dup_str == NULL)
                 return NULL;
 
@@ -401,7 +402,7 @@ cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list)
 {
 	struct cfs_range_expr	*expr;
 
-	cfs_list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
+	list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
 		if (value >= expr->re_lo && value <= expr->re_hi &&
 		    ((value - expr->re_lo) % expr->re_stride) == 0)
 			return 1;
@@ -426,7 +427,7 @@ cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp)
 	int			count = 0;
 	int			i;
 
-	cfs_list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
+	list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
 		for (i = expr->re_lo; i <= expr->re_hi; i++) {
 			if (((i - expr->re_lo) % expr->re_stride) == 0)
 				count++;
@@ -447,7 +448,7 @@ cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp)
 		return -ENOMEM;
 
 	count = 0;
-	cfs_list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
+	list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
 		for (i = expr->re_lo; i <= expr->re_hi; i++) {
 			if (((i - expr->re_lo) % expr->re_stride) == 0)
 				val[count++] = i;
@@ -467,12 +468,12 @@ EXPORT_SYMBOL(cfs_expr_list_values);
 void
 cfs_expr_list_free(struct cfs_expr_list *expr_list)
 {
-	while (!cfs_list_empty(&expr_list->el_exprs)) {
+	while (!list_empty(&expr_list->el_exprs)) {
 		struct cfs_range_expr *expr;
 
-		expr = cfs_list_entry(expr_list->el_exprs.next,
+		expr = list_entry(expr_list->el_exprs.next,
 				      struct cfs_range_expr, re_link),
-		cfs_list_del(&expr->re_link);
+		list_del(&expr->re_link);
 		LIBCFS_FREE(expr, sizeof(*expr));
 	}
 
@@ -485,7 +486,7 @@ cfs_expr_list_print(struct cfs_expr_list *expr_list)
 {
 	struct cfs_range_expr *expr;
 
-	cfs_list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
+	list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
 		CDEBUG(D_WARNING, "%d-%d/%d\n",
 		       expr->re_lo, expr->re_hi, expr->re_stride);
 	}
@@ -514,7 +515,7 @@ cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
 	src.ls_str = str;
 	src.ls_len = len;
 
-	CFS_INIT_LIST_HEAD(&expr_list->el_exprs);
+	INIT_LIST_HEAD(&expr_list->el_exprs);
 
 	if (src.ls_str[0] == '[' &&
 	    src.ls_str[src.ls_len - 1] == ']') {
@@ -534,13 +535,13 @@ cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
 			if (rc != 0)
 				break;
 
-			cfs_list_add_tail(&expr->re_link,
+			list_add_tail(&expr->re_link,
 					  &expr_list->el_exprs);
 		}
 	} else {
 		rc = cfs_range_expr_parse(&src, min, max, 0, &expr);
 		if (rc == 0) {
-			cfs_list_add_tail(&expr->re_link,
+			list_add_tail(&expr->re_link,
 					  &expr_list->el_exprs);
 		}
 	}
@@ -563,21 +564,21 @@ EXPORT_SYMBOL(cfs_expr_list_parse);
  * \retval none
  */
 void
-cfs_expr_list_free_list(cfs_list_t *list)
+cfs_expr_list_free_list(struct list_head *list)
 {
 	struct cfs_expr_list *el;
 
-	while (!cfs_list_empty(list)) {
-		el = cfs_list_entry(list->next,
+	while (!list_empty(list)) {
+		el = list_entry(list->next,
 				    struct cfs_expr_list, el_link);
-		cfs_list_del(&el->el_link);
+		list_del(&el->el_link);
 		cfs_expr_list_free(el);
 	}
 }
 EXPORT_SYMBOL(cfs_expr_list_free_list);
 
 int
-cfs_ip_addr_parse(char *str, int len, cfs_list_t *list)
+cfs_ip_addr_parse(char *str, int len, struct list_head *list)
 {
 	struct cfs_expr_list	*el;
 	struct cfs_lstr		src;
@@ -600,7 +601,7 @@ cfs_ip_addr_parse(char *str, int len, cfs_list_t *list)
 		if (rc != 0)
 			goto out;
 
-		cfs_list_add_tail(&el->el_link, list);
+		list_add_tail(&el->el_link, list);
 		i++;
 	}
 
@@ -622,12 +623,12 @@ EXPORT_SYMBOL(cfs_ip_addr_parse);
  * \retval 0 otherwise
  */
 int
-cfs_ip_addr_match(__u32 addr, cfs_list_t *list)
+cfs_ip_addr_match(__u32 addr, struct list_head *list)
 {
 	struct cfs_expr_list *el;
 	int i = 0;
 
-	cfs_list_for_each_entry_reverse(el, list, el_link) {
+	list_for_each_entry_reverse(el, list, el_link) {
 		if (!cfs_expr_list_match(addr & 0xff, el))
 			return 0;
 		addr >>= 8;
@@ -639,7 +640,7 @@ cfs_ip_addr_match(__u32 addr, cfs_list_t *list)
 EXPORT_SYMBOL(cfs_ip_addr_match);
 
 void
-cfs_ip_addr_free(cfs_list_t *list)
+cfs_ip_addr_free(struct list_head *list)
 {
 	cfs_expr_list_free_list(list);
 }