Commit 68ed1449 authored by Enzo Matsumiya's avatar Enzo Matsumiya Committed by Steve French
Browse files

cifs: remove unused server parameter from calc_smb_size() 



This parameter is unused by the called function

Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 5dd8ce24

fs/cifs/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server) 
		 smb->Command, smb->Status.CifsError,

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

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

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

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

#endif /* CONFIG_CIFS_DEBUG2 */

}

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ struct smb_version_operations { 
	int (*close_dir)(const unsigned int, struct cifs_tcon *,

			 struct cifs_fid *);

	/* calculate a size of SMB message */

	unsigned int (*calc_smb_size)(void *buf, struct TCP_Server_Info *ptcpi);

	unsigned int (*calc_smb_size)(void *buf);

	/* check for STATUS_PENDING and process the response if yes */

	bool (*is_status_pending)(char *buf, struct TCP_Server_Info *server);

	/* check for STATUS_NETWORK_SESSION_EXPIRED */

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name, 
extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);

extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,

				  struct cifsFileInfo **ret_file);

extern unsigned int smbCalcSize(void *buf, struct TCP_Server_Info *server);

extern unsigned int smbCalcSize(void *buf);

extern int decode_negTokenInit(unsigned char *security_blob, int length,

			struct TCP_Server_Info *server);

extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len);

fs/cifs/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server) 
	/* otherwise, there is enough to get to the BCC */

	if (check_smb_hdr(smb))

		return -EIO;

	clc_len = smbCalcSize(smb, server);

	clc_len = smbCalcSize(smb);



	if (4 + rfclen != total_read) {

		cifs_dbg(VFS, "Length read does not match RFC1001 length %d\n",

fs/cifs/netmisc.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ map_and_check_smb_error(struct mid_q_entry *mid, bool logErr) 
 * portion, the number of word parameters and the data portion of the message

 */

unsigned int

smbCalcSize(void *buf, struct TCP_Server_Info *server)

smbCalcSize(void *buf)

{

	struct smb_hdr *ptr = buf;

	return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +