diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-19 17:12:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-19 17:12:46 -0700 |
| commit | 4988f7a40f45929588d4b8f09c71eb785f55a19c (patch) | |
| tree | bc7a3892f6da27897dd0844d3eaeb226dd473d47 /fs | |
| parent | 073c516ff73557a8f7315066856c04b50383ac34 (diff) | |
| parent | 62a6cfddcc0a5313e7da3e8311ba16226fe0ac10 (diff) | |
| download | linux-stable-4988f7a40f45929588d4b8f09c71eb785f55a19c.tar.gz linux-stable-4988f7a40f45929588d4b8f09c71eb785f55a19c.tar.bz2 linux-stable-4988f7a40f45929588d4b8f09c71eb785f55a19c.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fix from Steve French:
"One more cifs fix for stable"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Do not send echoes before Negotiate is complete
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/smb1ops.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index cc93ba4da9b5..27bc360c7ffd 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -1015,6 +1015,15 @@ cifs_dir_needs_close(struct cifsFileInfo *cfile) return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle; } +static bool +cifs_can_echo(struct TCP_Server_Info *server) +{ + if (server->tcpStatus == CifsGood) + return true; + + return false; +} + struct smb_version_operations smb1_operations = { .send_cancel = send_nt_cancel, .compare_fids = cifs_compare_fids, @@ -1049,6 +1058,7 @@ struct smb_version_operations smb1_operations = { .get_dfs_refer = CIFSGetDFSRefer, .qfs_tcon = cifs_qfs_tcon, .is_path_accessible = cifs_is_path_accessible, + .can_echo = cifs_can_echo, .query_path_info = cifs_query_path_info, .query_file_info = cifs_query_file_info, .get_srv_inum = cifs_get_srv_inum, |