From 53a5e07043e9419e12cc4a1ce18c2bdc6ea7ee49 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Sun, 24 May 2009 18:45:15 -0400 Subject: [PATCH] --- yaml --- r: 146466 b: refs/heads/master c: 4ae1507f6d266d0cc3dd36e474d83aad70fec9e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bbdc6929fb7d..8196788b44cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50b64e3b77d569c217a48e078cd565dbd6462ad0 +refs/heads/master: 4ae1507f6d266d0cc3dd36e474d83aad70fec9e4 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 74b5a87e9195..10151f8d8495 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1096,17 +1096,17 @@ cifs_parse_mount_options(char *options, const char *devname, return 1; } } else if (strnicmp(data, "uid", 3) == 0) { - if (value && *value) { + if (value && *value) vol->linux_uid = simple_strtoul(value, &value, 0); + } else if (strnicmp(data, "forceuid", 8) == 0) { vol->override_uid = 1; - } } else if (strnicmp(data, "gid", 3) == 0) { - if (value && *value) { + if (value && *value) vol->linux_gid = simple_strtoul(value, &value, 0); + } else if (strnicmp(data, "forcegid", 8) == 0) { vol->override_gid = 1; - } } else if (strnicmp(data, "file_mode", 4) == 0) { if (value && *value) { vol->file_mode =