diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-02-06 04:55:19 +0100 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-02-06 16:12:00 +0100 |
| commit | 09c40b15351c1bb1af035f7f6df167366d552790 (patch) | |
| tree | 9fde04f64f40ecec0a522d6903689afc0952f075 /fs | |
| parent | cifs: Add tracepoints for errors on flush or fsync (diff) | |
| download | linux-09c40b15351c1bb1af035f7f6df167366d552790.tar.xz linux-09c40b15351c1bb1af035f7f6df167366d552790.zip | |
cifs: fix soft mounts hanging in the reconnect code
RHBZ: 1795423
This is the SMB1 version of a patch we already have for SMB2
In recent DFS updates we have a new variable controlling how many times we will
retry to reconnect the share.
If DFS is not used, then this variable is initialized to 0 in:
static inline int
dfs_cache_get_nr_tgts(const struct dfs_cache_tgt_list *tl)
{
return tl ? tl->tl_numtgts : 0;
}
This means that in the reconnect loop in smb2_reconnect() we will immediately wrap retries to -1
and never actually get to pass this conditional:
if (--retries)
continue;
The effect is that we no longer reach the point where we fail the commands with -EHOSTDOWN
and basically the kernel threads are virtually hung and unkillable.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index a481296f417f..3c89569e7210 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -260,7 +260,7 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command) if (server->tcpStatus != CifsNeedReconnect) break; - if (--retries) + if (retries && --retries) continue; /* |