Commit 4988f7a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 073c516f 62a6cfdd

fs/cifs/smb1ops.c

+10 −0
Original line number Diff line number Diff line
@@ -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,