From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38878 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752098AbbJQURi (ORCPT ); Sat, 17 Oct 2015 16:17:38 -0400 Subject: Patch "disabling oplocks/leases via module parm enable_oplocks broken for SMB3" has been added to the 4.1-stable tree To: smfrench@gmail.com, chandrika.srinivasan@citrix.com, gregkh@linuxfoundation.org, steve.french@primarydata.com Cc: , From: Date: Sat, 17 Oct 2015 13:17:37 -0700 Message-ID: <14451130572976@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled disabling oplocks/leases via module parm enable_oplocks broken for SMB3 to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From e0ddde9d44e37fbc21ce893553094ecf1a633ab5 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 22 Sep 2015 09:29:38 -0500 Subject: disabling oplocks/leases via module parm enable_oplocks broken for SMB3 From: Steve French 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 Reviewed-by: Chandrika Srinivasan Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -50,9 +50,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; Patches currently in stable-queue which might be from smfrench@gmail.com are queue-4.1/do-not-fall-back-to-smbwritex-in-set_file_size-error-cases.patch queue-4.1/fix-sec-krb5-on-smb3-mounts.patch queue-4.1/disabling-oplocks-leases-via-module-parm-enable_oplocks-broken-for-smb3.patch