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

Commit 5ca33c6a authored by Harvey Harrison's avatar Harvey Harrison Committed by Steve French
Browse files

cifs: assorted endian annotations 



fs/cifs/cifssmb.c:3917:13: warning: incorrect type in assignment (different base types)
fs/cifs/cifssmb.c:3917:13:    expected bool [unsigned] [usertype] is_unicode
fs/cifs/cifssmb.c:3917:13:    got restricted __le16

The comment explains why __force is used here.
fs/cifs/connect.c:458:16: warning: cast to restricted __be32
fs/cifs/connect.c:458:16: warning: cast to restricted __be32
fs/cifs/connect.c:458:16: warning: cast to restricted __be32
fs/cifs/connect.c:458:16: warning: cast to restricted __be32
fs/cifs/connect.c:458:16: warning: cast to restricted __be32
fs/cifs/connect.c:458:16: warning: cast to restricted __be32

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 8efdbde6

fs/cifs/cifssmb.c

+4 −1
Original line number Diff line number Diff line
@@ -3914,7 +3914,10 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, 
	bool is_unicode;

	struct dfs_referral_level_3 *ref;



	is_unicode = pSMBr->hdr.Flags2 & SMBFLG2_UNICODE;

	if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)

		is_unicode = true;

	else

		is_unicode = false;

	*num_of_nodes = le16_to_cpu(pSMBr->NumberOfReferrals);



	if (*num_of_nodes < 1) {

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) 
		/* Note that FC 1001 length is big endian on the wire,

		but we convert it here so it is always manipulated

		as host byte order */

		pdu_length = ntohl(smb_buffer->smb_buf_length);

		pdu_length = be32_to_cpu((__force __be32)smb_buffer->smb_buf_length);

		smb_buffer->smb_buf_length = pdu_length;



		cFYI(1, ("rfc1002 length 0x%x", pdu_length+4));