diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 14:05:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 14:05:06 -0800 |
| commit | 7e928df80d30b7664b5822784c95b4a54dc7cfbf (patch) | |
| tree | 6926184cd629693315c0061bce310db4b9de6165 /fs/cifs/connect.c | |
| parent | 3cd6d495db2a0acfd2854f43aac8bfc5914bc89c (diff) | |
| parent | d5c7076b772ad7dcdb92303397b36aee8fa0d25d (diff) | |
Merge tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull smb3 fixes from Steve French:
"Three fixes, one for stable, one adds the (most secure) SMB3.1.1
dialect to default list requested"
* tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6:
smb3: add smb3.1.1 to default dialect list
cifs: fix confusing warning message on reconnect
smb3: fix large reads on encrypted connections
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 69b9d5606eba..f66529679ca2 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -483,7 +483,7 @@ cifs_reconnect(struct TCP_Server_Info *server) cifs_sb = NULL; } else { rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list, &tgt_it); - if (rc) { + if (rc && (rc != -EOPNOTSUPP)) { cifs_dbg(VFS, "%s: no target servers for DFS failover\n", __func__); } else { |