diff options
| author | Steve French <smfrench@gmail.com> | 2015-09-22 09:29:38 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-10-27 22:13:39 -0400 |
| commit | 4409cd1890741914aaf90c8bfca09ebec1c643ed (patch) | |
| tree | 3abaff20f77c1dc9d1c80b9d0953e854fb48dc73 /fs | |
| parent | f67da13760a0be601a1d3b3daef030c2e5e7cdec (diff) | |
disabling oplocks/leases via module parm enable_oplocks broken for SMB3
[ Upstream commit e0ddde9d44e37fbc21ce893553094ecf1a633ab5 ]
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>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs')
| -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 cc93a7ffe8e4..51f5251d7db5 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -50,9 +50,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; |