From a5ce2f93fd6c7f80c4624f1ea62e2d177fa658dc Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 30 Aug 2005 15:25:52 -0700 Subject: [PATCH] --- yaml --- r: 12043 b: refs/heads/master c: cb8be64084e6294fcb9e558188fe104050b94f0b h: refs/heads/master i: 12041: f91cbb6cca77fad4c8b131161c8515ec5f33923a 12039: 666334f64c60f9f2057eb3a0ab813691e9d0fc32 v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ce74d94a7eb1..10d2e9220def 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16abbecdad3367c76c12537450eba0d86943fe2c +refs/heads/master: cb8be64084e6294fcb9e558188fe104050b94f0b diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 134195cc4073..f784b70abfeb 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1078,7 +1078,8 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol) vol->nocase = 1; } else if (strnicmp(data, "brl", 3) == 0) { vol->nobrl = 0; - } else if (strnicmp(data, "nobrl", 5) == 0) { + } else if ((strnicmp(data, "nobrl", 5) == 0) || + (strnicmp(data, "nolock", 6)) { vol->nobrl = 1; /* turn off mandatory locking in mode if remote locking is turned off since the