Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14547f7d authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: add server argument to the dump_detail method 



We need a struct TCP_Server_Info *server to this method as it calls
calc_size. The calc_size method will soon be changed to also
take a server argument.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 3d4ef9a1

fs/cifs/cifs_debug.c

+3 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ cifs_dump_mem(char *label, void *data, int length) 
		       data, length, true);

}



void cifs_dump_detail(void *buf)

void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)

{

#ifdef CONFIG_CIFS_DEBUG2

	struct smb_hdr *smb = (struct smb_hdr *)buf;
@@ -50,7 +50,8 @@ void cifs_dump_detail(void *buf) 
	cifs_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d\n",

		 smb->Command, smb->Status.CifsError,

		 smb->Flags, smb->Flags2, smb->Mid, smb->Pid);

	cifs_dbg(VFS, "smb buf %p len %u\n", smb, smbCalcSize(smb));

	cifs_dbg(VFS, "smb buf %p len %u\n", smb,

		 server->ops->calc_smb_size(smb));

#endif /* CONFIG_CIFS_DEBUG2 */

}

fs/cifs/cifs_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define _H_CIFS_DEBUG



void cifs_dump_mem(char *label, void *data, int length);

void cifs_dump_detail(void *);

void cifs_dump_detail(void *buf, struct TCP_Server_Info *ptcp_info);

void cifs_dump_mids(struct TCP_Server_Info *);

extern bool traceSMB;		/* flag which enables the function below */

void dump_smb(void *, int);

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ struct smb_version_operations { 
	int (*map_error)(char *, bool);

	/* find mid corresponding to the response message */

	struct mid_q_entry * (*find_mid)(struct TCP_Server_Info *, char *);

	void (*dump_detail)(void *);

	void (*dump_detail)(void *buf, struct TCP_Server_Info *ptcp_info);

	void (*clear_stats)(struct cifs_tcon *);

	void (*print_stats)(struct seq_file *m, struct cifs_tcon *);

	void (*dump_share_caps)(struct seq_file *, struct cifs_tcon *);

fs/cifs/smb2ops.c

+3 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ smb2_find_mid(struct TCP_Server_Info *server, char *buf) 
}



static void

smb2_dump_detail(void *buf)

smb2_dump_detail(void *buf, struct TCP_Server_Info *server)

{

#ifdef CONFIG_CIFS_DEBUG2

	struct smb2_sync_hdr *shdr = get_sync_hdr(buf);
@@ -220,7 +220,8 @@ smb2_dump_detail(void *buf) 
	cifs_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",

		 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,

		 shdr->ProcessId);

	cifs_dbg(VFS, "smb buf %p len %u\n", buf, smb2_calc_size(buf));

	cifs_dbg(VFS, "smb buf %p len %u\n", buf,

		 server->ops->calc_smb_size(buf));

#endif

}