diff --git a/[refs] b/[refs] index e9fcaf8c1ca6..dbe0b7c9be17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56c24305d1494a7e345c75669dc60e8b231b735b +refs/heads/master: bd7633195581c7665ce9dd80c665ec93466d1b64 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index a65d311d163a..9f59887badd2 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1113,6 +1113,8 @@ cifs_parse_mount_options(char *options, const char *devname, } else if (!strnicmp(data, "uid", 3) && value && *value) { vol->linux_uid = simple_strtoul(value, &value, 0); uid_specified = true; + } else if (!strnicmp(data, "cruid", 5) && value && *value) { + vol->cred_uid = simple_strtoul(value, &value, 0); } else if (!strnicmp(data, "forceuid", 8)) { override_uid = 1; } else if (!strnicmp(data, "noforceuid", 10)) {