3.14-stable patches

added patches:
	disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch

diff --git a/queue-3.14/disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch b/queue-3.14/disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch
new file mode 100644 (file)
index 0000000..8655251
--- /dev/null
+++ b/queue-3.14/disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch
@@ -0,0 +1,38 @@
+From e0ddde9d44e37fbc21ce893553094ecf1a633ab5 Mon Sep 17 00:00:00 2001
+From: Steve French <smfrench@gmail.com>
+Date: Tue, 22 Sep 2015 09:29:38 -0500
+Subject: disabling oplocks/leases via module parm enable_oplocks broken for SMB3
+
+From: Steve French <smfrench@gmail.com>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/smb2ops.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/fs/cifs/smb2ops.c
++++ b/fs/cifs/smb2ops.c
+@@ -49,9 +49,13 @@ change_conf(struct TCP_Server_Info *serv
+               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;

diff --git a/queue-3.14/series b/queue-3.14/series
index 72b3f1384a1dc2b3fe479cd9862ddeb876f6d857..f54104452deb447fdd14b37a1d9a4a5296041e5f 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -38,3 +38,4 @@ dm-raid-fix-round-up-of-default-region-size.patch
 netfilter-nf_conntrack-support-expectations-in-different-zones.patch
 netfilter-ctnetlink-put-back-references-to-master-ct-and-expect-objects.patch
 netfilter-nft_compat-skip-family-comparison-in-case-of-nfproto_unspec.patch
+disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch