Эх сурвалжийг харах

disabling oplocks/leases via module parm enable_oplocks broken for SMB3

leases (oplocks) were always requested for SMB2/SMB3 even when oplocks
disabled in the cifs.ko module.

Signed-off-by: Steve French <steve.french@primarydata.com>
Reviewed-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>
CC: Stable <stable@vger.kernel.org>
Steve French 10 жил өмнө
parent
commit
e0ddde9d44
1 өөрчлөгдсөн 6 нэмэгдсэн , 2 устгасан
  1. 6 2
      fs/cifs/smb2ops.c

+ 6 - 2
fs/cifs/smb2ops.c

@@ -50,9 +50,13 @@ change_conf(struct TCP_Server_Info *server)
 		break;
 	default:
 		server->echoes = true;
-		server->oplocks = true;
+		if (enable_oplocks) {
+			server->oplocks = true;
+			server->oplock_credits = 1;
+		} else
+			server->oplocks = false;
+
 		server->echo_credits = 1;
-		server->oplock_credits = 1;
 	}
 	server->credits -= server->echo_credits + server->oplock_credits;
 	return 0;