Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...

[linux-2.6-block.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 36ca2045009bf342ef507c132921484c7eaf7ded..239e1fb330002f5153cc2bbb1047506254aa5276 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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;
                        }