Commit 36c31540 authored by ZhangGuoDong's avatar ZhangGuoDong Committed by Steve French
Browse files

smb: move get_rfc1002_len() to common/smbglob.h 



Rename get_rfc1002_length() to get_rfc1002_len(), then move duplicate
definitions to common header file.

Co-developed-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarZhangGuoDong <zhangguodong@kylinos.cn>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 34cf191b

fs/smb/client/cifsglob.h

+0 −6
Original line number Diff line number Diff line
@@ -670,12 +670,6 @@ struct cifs_mnt_data { 
	int flags;

};



static inline unsigned int

get_rfc1002_length(void *buf)

{

	return be32_to_cpu(*((__be32 *)buf)) & 0xffffff;

}



struct TCP_Server_Info {

	struct list_head tcp_ses_list;

	struct list_head smb_ses_list;

fs/smb/client/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server) 


	iov[0].iov_len = 4;

	iov[0].iov_base = smb;

	iov[1].iov_len = get_rfc1002_length(smb);

	iov[1].iov_len = get_rfc1002_len(smb);

	iov[1].iov_base = (char *)smb + 4;



	rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback, NULL,
@@ -1458,7 +1458,7 @@ cifs_async_readv(struct cifs_io_subrequest *rdata) 
	rdata->iov[0].iov_base = smb;

	rdata->iov[0].iov_len = 4;

	rdata->iov[1].iov_base = (char *)smb + 4;

	rdata->iov[1].iov_len = get_rfc1002_length(smb);

	rdata->iov[1].iov_len = get_rfc1002_len(smb);



	trace_smb3_read_enter(rdata->rreq->debug_id,

			      rdata->subreq.debug_index,
@@ -1830,7 +1830,7 @@ cifs_async_writev(struct cifs_io_subrequest *wdata) 
	/* 4 for RFC1001 length + 1 for BCC */

	iov[0].iov_len = 4;

	iov[0].iov_base = smb;

	iov[1].iov_len = get_rfc1002_length(smb) + 1;

	iov[1].iov_len = get_rfc1002_len(smb) + 1;

	iov[1].iov_base = (char *)smb + 4;



	rqst.rq_iov = iov;

fs/smb/client/cifstransport.c

+4 −4
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, 
	int resp_buf_type;



	iov[0].iov_base = in_buf;

	iov[0].iov_len = get_rfc1002_length(in_buf) + 4;

	iov[0].iov_len = get_rfc1002_len(in_buf) + 4;

	flags |= CIFS_NO_RSP_BUF;

	rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);

	cifs_dbg(NOISY, "SendRcvNoRsp flags %d rc %d\n", flags, rc);
@@ -177,7 +177,7 @@ int 
cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,

		   bool log_error)

{

	unsigned int len = get_rfc1002_length(mid->resp_buf) + 4;

	unsigned int len = get_rfc1002_len(mid->resp_buf) + 4;



	dump_smb(mid->resp_buf, min_t(u32, 92, len));
@@ -370,7 +370,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
		goto out;

	}



	*pbytes_returned = get_rfc1002_length(midQ->resp_buf);

	*pbytes_returned = get_rfc1002_len(midQ->resp_buf);

	memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);

	rc = cifs_check_receive(midQ, server, 0);

out:
@@ -554,7 +554,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, 
		goto out;

	}



	*pbytes_returned = get_rfc1002_length(midQ->resp_buf);

	*pbytes_returned = get_rfc1002_len(midQ->resp_buf);

	memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4);

	rc = cifs_check_receive(midQ, server, 0);

out:

fs/smb/client/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ cifs_demultiplex_thread(void *p) 
		 * The right amount was read from socket - 4 bytes,

		 * so we can now interpret the length field.

		 */

		pdu_length = get_rfc1002_length(buf);

		pdu_length = get_rfc1002_len(buf);



		cifs_dbg(FYI, "RFC1002 header 0x%x\n", pdu_length);

		if (!is_smb_response(server, buf[0]))

fs/smb/common/smbglob.h

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ struct smb_version_values { 
	size_t		create_posix_size;

};



static inline unsigned int get_rfc1002_len(void *buf)

{

	return be32_to_cpu(*((__be32 *)buf)) & 0xffffff;

}



static inline void inc_rfc1001_len(void *buf, int count)

{

	be32_add_cpu((__be32 *)buf, count);