Commit ace2045e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.19-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs client fixes from Steve French:
 "Two cifs debugging improvements - one found to deal with debugging a
  multichannel problem and one for a recent fallocate issue

  This does include the two larger multichannel reconnect (dynamically
  adjusting interfaces on reconnect) patches, because we recently found
  an additional problem with multichannel to one server type that I want
  to include at the same time"

* tag '5.19-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: when a channel is not found for server, log its connection id
  smb3: add trace point for SMB2_set_eof
parents 4b35035b 5d24968f

fs/cifs/sess.c

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ cifs_ses_get_chan_index(struct cifs_ses *ses, 
	}



	/* If we didn't find the channel, it is likely a bug */

	if (server)

		cifs_dbg(VFS, "unable to get chan index for server: 0x%llx",

			 server->conn_id);

	WARN_ON(1);

	return 0;

}

fs/cifs/smb2pdu.c

+2 −0
Original line number Diff line number Diff line
@@ -5154,6 +5154,8 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, 
	data = &info;

	size = sizeof(struct smb2_file_eof_info);



	trace_smb3_set_eof(xid, persistent_fid, tcon->tid, tcon->ses->Suid, le64_to_cpu(*eof));



	return send_set_info(xid, tcon, persistent_fid, volatile_fid,

			pid, FILE_END_OF_FILE_INFORMATION, SMB2_O_INFO_FILE,

			0, 1, &data, &size);

fs/cifs/trace.h

+38 −0
Original line number Diff line number Diff line
@@ -121,6 +121,44 @@ DEFINE_SMB3_RW_DONE_EVENT(query_dir_done); 
DEFINE_SMB3_RW_DONE_EVENT(zero_done);

DEFINE_SMB3_RW_DONE_EVENT(falloc_done);



/* For logging successful set EOF (truncate) */

DECLARE_EVENT_CLASS(smb3_eof_class,

	TP_PROTO(unsigned int xid,

		__u64	fid,

		__u32	tid,

		__u64	sesid,

		__u64	offset),

	TP_ARGS(xid, fid, tid, sesid, offset),

	TP_STRUCT__entry(

		__field(unsigned int, xid)

		__field(__u64, fid)

		__field(__u32, tid)

		__field(__u64, sesid)

		__field(__u64, offset)

	),

	TP_fast_assign(

		__entry->xid = xid;

		__entry->fid = fid;

		__entry->tid = tid;

		__entry->sesid = sesid;

		__entry->offset = offset;

	),

	TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx",

		__entry->xid, __entry->sesid, __entry->tid, __entry->fid,

		__entry->offset)

)



#define DEFINE_SMB3_EOF_EVENT(name)         \

DEFINE_EVENT(smb3_eof_class, smb3_##name,   \

	TP_PROTO(unsigned int xid,		\

		__u64	fid,			\

		__u32	tid,			\

		__u64	sesid,			\

		__u64	offset),		\

	TP_ARGS(xid, fid, tid, sesid, offset))



DEFINE_SMB3_EOF_EVENT(set_eof);



/*

 * For handle based calls other than read and write, and get/set info

 */