瀏覽代碼

[CIFS] Add nolock synonym (ala nfs) for nobrl to disable sending byte range
locks remotely.

Signed-off-by: Steve French (sfrench@us.ibm.com)

Steve French 20 年之前
父節點
當前提交
cb8be64084
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      fs/cifs/connect.c

+ 2 - 1
fs/cifs/connect.c

@@ -1078,7 +1078,8 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)
                         vol->nocase = 1;
                         vol->nocase = 1;
 		} else if (strnicmp(data, "brl", 3) == 0) {
 		} else if (strnicmp(data, "brl", 3) == 0) {
 			vol->nobrl =  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;
 			vol->nobrl =  1;
 			/* turn off mandatory locking in mode
 			/* turn off mandatory locking in mode
 			if remote locking is turned off since the
 			if remote locking is turned off since the