Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cifs: remove unused server parameter from calc_smb_size()

This parameter is unused by the called function

Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>

authored by

Enzo Matsumiya and committed by
Steve French
68ed1449 5dd8ce24

+11 -13
+1 -1
fs/cifs/cifs_debug.c
··· 42 42 smb->Command, smb->Status.CifsError, 43 43 smb->Flags, smb->Flags2, smb->Mid, smb->Pid); 44 44 cifs_dbg(VFS, "smb buf %p len %u\n", smb, 45 - server->ops->calc_smb_size(smb, server)); 45 + server->ops->calc_smb_size(smb)); 46 46 #endif /* CONFIG_CIFS_DEBUG2 */ 47 47 } 48 48
+1 -1
fs/cifs/cifsglob.h
··· 417 417 int (*close_dir)(const unsigned int, struct cifs_tcon *, 418 418 struct cifs_fid *); 419 419 /* calculate a size of SMB message */ 420 - unsigned int (*calc_smb_size)(void *buf, struct TCP_Server_Info *ptcpi); 420 + unsigned int (*calc_smb_size)(void *buf); 421 421 /* check for STATUS_PENDING and process the response if yes */ 422 422 bool (*is_status_pending)(char *buf, struct TCP_Server_Info *server); 423 423 /* check for STATUS_NETWORK_SESSION_EXPIRED */
+1 -1
fs/cifs/cifsproto.h
··· 151 151 extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool); 152 152 extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name, 153 153 struct cifsFileInfo **ret_file); 154 - extern unsigned int smbCalcSize(void *buf, struct TCP_Server_Info *server); 154 + extern unsigned int smbCalcSize(void *buf); 155 155 extern int decode_negTokenInit(unsigned char *security_blob, int length, 156 156 struct TCP_Server_Info *server); 157 157 extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len);
+1 -1
fs/cifs/misc.c
··· 354 354 /* otherwise, there is enough to get to the BCC */ 355 355 if (check_smb_hdr(smb)) 356 356 return -EIO; 357 - clc_len = smbCalcSize(smb, server); 357 + clc_len = smbCalcSize(smb); 358 358 359 359 if (4 + rfclen != total_read) { 360 360 cifs_dbg(VFS, "Length read does not match RFC1001 length %d\n",
+1 -1
fs/cifs/netmisc.c
··· 909 909 * portion, the number of word parameters and the data portion of the message 910 910 */ 911 911 unsigned int 912 - smbCalcSize(void *buf, struct TCP_Server_Info *server) 912 + smbCalcSize(void *buf) 913 913 { 914 914 struct smb_hdr *ptr = buf; 915 915 return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
+2 -4
fs/cifs/readdir.c
··· 806 806 807 807 end_of_smb = cfile->srch_inf.ntwrk_buf_start + 808 808 server->ops->calc_smb_size( 809 - cfile->srch_inf.ntwrk_buf_start, 810 - server); 809 + cfile->srch_inf.ntwrk_buf_start); 811 810 812 811 cur_ent = cfile->srch_inf.srch_entries_start; 813 812 first_entry_in_buffer = cfile->srch_inf.index_of_last_entry ··· 1160 1161 cifs_dbg(FYI, "loop through %d times filling dir for net buf %p\n", 1161 1162 num_to_fill, cifsFile->srch_inf.ntwrk_buf_start); 1162 1163 max_len = tcon->ses->server->ops->calc_smb_size( 1163 - cifsFile->srch_inf.ntwrk_buf_start, 1164 - tcon->ses->server); 1164 + cifsFile->srch_inf.ntwrk_buf_start); 1165 1165 end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len; 1166 1166 1167 1167 tmp_buf = kmalloc(UNICODE_NAME_MAX, GFP_KERNEL);
+2 -2
fs/cifs/smb2misc.c
··· 222 222 } 223 223 } 224 224 225 - calc_len = smb2_calc_size(buf, server); 225 + calc_len = smb2_calc_size(buf); 226 226 227 227 /* For SMB2_IOCTL, OutputOffset and OutputLength are optional, so might 228 228 * be 0, and not a real miscalculation */ ··· 410 410 * portion, the number of word parameters and the data portion of the message. 411 411 */ 412 412 unsigned int 413 - smb2_calc_size(void *buf, struct TCP_Server_Info *srvr) 413 + smb2_calc_size(void *buf) 414 414 { 415 415 struct smb2_pdu *pdu = buf; 416 416 struct smb2_hdr *shdr = &pdu->hdr;
+1 -1
fs/cifs/smb2ops.c
··· 387 387 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId, 388 388 shdr->Id.SyncId.ProcessId); 389 389 cifs_server_dbg(VFS, "smb buf %p len %u\n", buf, 390 - server->ops->calc_smb_size(buf, server)); 390 + server->ops->calc_smb_size(buf)); 391 391 #endif 392 392 } 393 393
+1 -1
fs/cifs/smb2proto.h
··· 23 23 extern int map_smb2_to_linux_error(char *buf, bool log_err); 24 24 extern int smb2_check_message(char *buf, unsigned int length, 25 25 struct TCP_Server_Info *server); 26 - extern unsigned int smb2_calc_size(void *buf, struct TCP_Server_Info *server); 26 + extern unsigned int smb2_calc_size(void *buf); 27 27 extern char *smb2_get_data_area_len(int *off, int *len, 28 28 struct smb2_hdr *shdr); 29 29 extern __le16 *cifs_convert_path_to_utf16(const char *from,