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 <stable@xxxxxxxxxxxxxxx> know about it. >From e0ddde9d44e37fbc21ce893553094ecf1a633ab5 Mon Sep 17 00:00:00 2001 From: Steve French <smfrench@xxxxxxxxx> 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@xxxxxxxxx> 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@xxxxxxxxxxxxxxx> Reviewed-by: Chandrika Srinivasan <chandrika.srinivasan@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxxx 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html