aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-30 15:25:52 -0700
committerSteve French <sfrench@us.ibm.com>2005-08-30 15:25:52 -0700
commitcb8be64084e6294fcb9e558188fe104050b94f0b (patch)
tree6272a7d0b7eab5a6127f9f2c4a6e3006a69a035b /fs
parent16abbecdad3367c76c12537450eba0d86943fe2c (diff)
[CIFS] Add nolock synonym (ala nfs) for nobrl to disable sending byte range
locks remotely. Signed-off-by: Steve French (sfrench@us.ibm.com)
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 134195cc407..f784b70abfe 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