diff options
| author | Peng Tao <bergwolf@gmail.com> | 2014-03-05 21:27:16 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-08 19:23:56 -0800 |
| commit | 7a72458266a672f566d4460bd54f30c49a1ce68b (patch) | |
| tree | 7af723df769f565cbe74a42a31d9caf486883be2 /drivers/staging/lustre | |
| parent | 82a2390c3c4ecf39402787c75dc8a69a024d5786 (diff) | |
| download | linux-7a72458266a672f566d4460bd54f30c49a1ce68b.tar.gz linux-7a72458266a672f566d4460bd54f30c49a1ce68b.tar.bz2 linux-7a72458266a672f566d4460bd54f30c49a1ce68b.zip | |
staging/lustre/libcfs: remove cfs_strncasecmp
The only difference against generic strncasecmp() is that
cfs_strncasecmp() check NULL pointers and zero length parameter,
which all callers have already taken care of.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/router_proc.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 24 |
2 files changed, 4 insertions, 24 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 20d53e08705e..0cbd9fc98e07 100644 --- a/drivers/staging/lustre/lnet/lnet/router_proc.c +++ b/drivers/staging/lustre/lnet/lnet/router_proc.c @@ -837,8 +837,8 @@ static int __proc_lnet_portal_rotor(void *data, int write, rc = -EINVAL; lnet_res_lock(0); for (i = 0; portal_rotors[i].pr_name != NULL; i++) { - if (cfs_strncasecmp(portal_rotors[i].pr_name, tmp, - strlen(portal_rotors[i].pr_name)) == 0) { + if (strncasecmp(portal_rotors[i].pr_name, tmp, + strlen(portal_rotors[i].pr_name)) == 0) { portal_rotor = portal_rotors[i].pr_value; rc = 0; break; diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c index 922debd0a412..dc6a59a1bba3 100644 --- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c +++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c @@ -42,26 +42,6 @@ #include <linux/libcfs/libcfs.h> -/* non-0 = don't match */ -int cfs_strncasecmp(const char *s1, const char *s2, size_t n) -{ - if (s1 == NULL || s2 == NULL) - return 1; - - if (n == 0) - return 0; - - while (n-- != 0 && tolower(*s1) == tolower(*s2)) { - if (n == 0 || *s1 == '\0' || *s2 == '\0') - break; - s1++; - s2++; - } - - 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), int *oldmask, int minmask, int allmask) @@ -101,7 +81,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), debugstr = bit2str(i); if (debugstr != NULL && strlen(debugstr) == len && - cfs_strncasecmp(str, debugstr, len) == 0) { + strncasecmp(str, debugstr, len) == 0) { if (op == '-') newmask &= ~(1 << i); else @@ -111,7 +91,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), } } if (!found && len == 3 && - (cfs_strncasecmp(str, "ALL", len) == 0)) { + (strncasecmp(str, "ALL", len) == 0)) { if (op == '-') newmask = minmask; else |