diff options
| author | Rabin Vincent <rabinv@axis.com> | 2016-07-19 09:25:45 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2016-07-19 19:19:45 +0200 |
| commit | b782fcc1cbeb7e336c0ed1f00004b2208f48ffe0 (patch) | |
| tree | 3a2a706873393f574f4927d6ca86b8bad1313f93 /fs/cifs | |
| parent | cifs: Check for existing directory when opening file with O_CREAT (diff) | |
| download | linux-b782fcc1cbeb7e336c0ed1f00004b2208f48ffe0.tar.xz linux-b782fcc1cbeb7e336c0ed1f00004b2208f48ffe0.zip | |
cifs: unbreak TCP session reuse
adfeb3e0 ("cifs: Make echo interval tunable") added a comparison of
vol->echo_interval to server->echo_interval as a criterium to
match_server(), but:
(1) A default value is set for server->echo_interval but not for
vol->echo_interval, meaning these can never match if the echo_interval
option is not specified.
(2) vol->echo_interval is in seconds but server->echo_interval is in
jiffies, meaning these can never match even if the echo_interval option
is specified.
This broke TCP session reuse since match_server() can never return 1.
Fix it.
Fixes: adfeb3e0 ("cifs: Make echo interval tunable")
Signed-off-by: Rabin Vincent <rabinv@axis.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 7d2b15c06090..eb24653612bc 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1228,6 +1228,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, vol->ops = &smb1_operations; vol->vals = &smb1_values; + vol->echo_interval = SMB_ECHO_INTERVAL_DEFAULT; + if (!mountdata) goto cifs_parse_mount_err; @@ -2049,7 +2051,7 @@ static int match_server(struct TCP_Server_Info *server, struct smb_vol *vol) if (!match_security(server, vol)) return 0; - if (server->echo_interval != vol->echo_interval) + if (server->echo_interval != vol->echo_interval * HZ) return 0; return 1; |