Skip to content

Commit 4988f7a

Browse files
committed
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
2 parents 073c516 + 62a6cfd commit 4988f7a

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

fs/cifs/smb1ops.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,15 @@ cifs_dir_needs_close(struct cifsFileInfo *cfile)
10151015
return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle;
10161016
}
10171017

1018+
static bool
1019+
cifs_can_echo(struct TCP_Server_Info *server)
1020+
{
1021+
if (server->tcpStatus == CifsGood)
1022+
return true;
1023+
1024+
return false;
1025+
}
1026+
10181027
struct smb_version_operations smb1_operations = {
10191028
.send_cancel = send_nt_cancel,
10201029
.compare_fids = cifs_compare_fids,
@@ -1049,6 +1058,7 @@ struct smb_version_operations smb1_operations = {
10491058
.get_dfs_refer = CIFSGetDFSRefer,
10501059
.qfs_tcon = cifs_qfs_tcon,
10511060
.is_path_accessible = cifs_is_path_accessible,
1061+
.can_echo = cifs_can_echo,
10521062
.query_path_info = cifs_query_path_info,
10531063
.query_file_info = cifs_query_file_info,
10541064
.get_srv_inum = cifs_get_srv_inum,

0 commit comments

Comments
 (0)