Commit 87e747cd authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds

cifs: replace strnicmp with strncasecmp

The kernel used to contain two functions for length-delimited,
case-insensitive string comparison, strnicmp with correct semantics and
a slightly buggy strncasecmp.  The latter is the POSIX name, so strnicmp
was renamed to strncasecmp, and strnicmp made into a wrapper for the new
strncasecmp to avoid breaking existing users.

To allow the compat wrapper strnicmp to be removed at some point in the
future, and to avoid the extra indirection cost, do
s/strnicmp/strncasecmp/g.
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steve French <sfrench@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4dd0869
...@@ -195,15 +195,15 @@ char *cifs_compose_mount_options(const char *sb_mountdata, ...@@ -195,15 +195,15 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
else else
noff = tkn_e - (sb_mountdata + off) + 1; noff = tkn_e - (sb_mountdata + off) + 1;
if (strnicmp(sb_mountdata + off, "unc=", 4) == 0) { if (strncasecmp(sb_mountdata + off, "unc=", 4) == 0) {
off += noff; off += noff;
continue; continue;
} }
if (strnicmp(sb_mountdata + off, "ip=", 3) == 0) { if (strncasecmp(sb_mountdata + off, "ip=", 3) == 0) {
off += noff; off += noff;
continue; continue;
} }
if (strnicmp(sb_mountdata + off, "prefixpath=", 11) == 0) { if (strncasecmp(sb_mountdata + off, "prefixpath=", 11) == 0) {
off += noff; off += noff;
continue; continue;
} }
......
...@@ -1718,7 +1718,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, ...@@ -1718,7 +1718,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
goto cifs_parse_mount_err; goto cifs_parse_mount_err;
} }
if (strnicmp(string, "default", 7) != 0) { if (strncasecmp(string, "default", 7) != 0) {
vol->iocharset = kstrdup(string, vol->iocharset = kstrdup(string,
GFP_KERNEL); GFP_KERNEL);
if (!vol->iocharset) { if (!vol->iocharset) {
...@@ -1790,7 +1790,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, ...@@ -1790,7 +1790,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
if (string == NULL) if (string == NULL)
goto out_nomem; goto out_nomem;
if (strnicmp(string, "1", 1) == 0) { if (strncasecmp(string, "1", 1) == 0) {
/* This is the default */ /* This is the default */
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment