From: Steve French <smfrench@gmail.com>
Date: Tue, 22 Sep 2015 14:29:38 +0000 (-0500)
Subject: disabling oplocks/leases via module parm enable_oplocks broken for SMB3
X-Git-Tag: v3.16.35~1228
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55d3880baa381fbeb990aab1d8cfe51220f71b5f;p=thirdparty%2Fkernel%2Fstable.git

disabling oplocks/leases via module parm enable_oplocks broken for SMB3

commit e0ddde9d44e37fbc21ce893553094ecf1a633ab5 upstream.

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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 772ee0ecf32aa..b241a2a7683be 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -49,9 +49,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;