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: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Steve French <sfrench@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c4dd08694b
commit
87e747cdb9
|
@ -195,15 +195,15 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
|
|||
else
|
||||
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;
|
||||
continue;
|
||||
}
|
||||
if (strnicmp(sb_mountdata + off, "ip=", 3) == 0) {
|
||||
if (strncasecmp(sb_mountdata + off, "ip=", 3) == 0) {
|
||||
off += noff;
|
||||
continue;
|
||||
}
|
||||
if (strnicmp(sb_mountdata + off, "prefixpath=", 11) == 0) {
|
||||
if (strncasecmp(sb_mountdata + off, "prefixpath=", 11) == 0) {
|
||||
off += noff;
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -1718,7 +1718,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
|
|||
goto cifs_parse_mount_err;
|
||||
}
|
||||
|
||||
if (strnicmp(string, "default", 7) != 0) {
|
||||
if (strncasecmp(string, "default", 7) != 0) {
|
||||
vol->iocharset = kstrdup(string,
|
||||
GFP_KERNEL);
|
||||
if (!vol->iocharset) {
|
||||
|
@ -1790,7 +1790,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
|
|||
if (string == NULL)
|
||||
goto out_nomem;
|
||||
|
||||
if (strnicmp(string, "1", 1) == 0) {
|
||||
if (strncasecmp(string, "1", 1) == 0) {
|
||||
/* This is the default */
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue