diff options
| author | Steve French <smfrench@gmail.com> | 2015-09-22 09:29:38 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:37:52 +0100 |
| commit | 7c12a537ab0f9472888077901307f8a6492620e0 (patch) | |
| tree | 3e3a4a84962140270cf98c47c348727f741b66ae /fs/cifs | |
| parent | 89c632d16bbfd4a8ee8ed0224e65eb4561d63dbb (diff) | |
| download | lwn-7c12a537ab0f9472888077901307f8a6492620e0.tar.gz lwn-7c12a537ab0f9472888077901307f8a6492620e0.zip | |
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/smb2ops.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 6f79cd867a2e..57519567b2ac 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; |