From: Steve French Date: Tue, 30 Aug 2005 22:25:52 +0000 (-0700) Subject: [CIFS] Add nolock synonym (ala nfs) for nobrl to disable sending byte range X-Git-Tag: v2.6.15-rc1~18^2~35^2~5^2~32 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb8be64084e6294fcb9e558188fe104050b94f0b;p=linux-2.6 [CIFS] Add nolock synonym (ala nfs) for nobrl to disable sending byte range locks remotely. Signed-off-by: Steve French (sfrench@us.ibm.com) --- diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 134195cc40..f784b70abf 100644 --- a/fs/cifs/connect.c +++ b/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