diff options
| author |   Steve French <smfrench@gmail.com> | 2015-09-22 09:29:38 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2015-09-22 15:23:57 -0500 |
| commit | e0ddde9d44e37fbc21ce893553094ecf1a633ab5 (patch) | |
| tree | 8b2c0c2acf0542c529fc6263940c47d2c8e843e3 /fs/cifs | |
| parent | Merge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| download | linux-dev-e0ddde9d44e37fbc21ce893553094ecf1a633ab5.tar.xz linux-dev-e0ddde9d44e37fbc21ce893553094ecf1a633ab5.zip | |
disabling oplocks/leases via module parm enable_oplocks broken for SMB3
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>
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 df91bcf56d67..18da19f4f811 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; |