[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 134195cc40731c0530160cb8497b17e6a53b51d0..f784b70abfeb5b95597d0a9f40c6b1952322930b 100644 (file)
--- 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