Commit 50a2c953 authored Oct 13, 2016 by David Howells

afs: call->operation_ID sometimes used as __be32 sometimes as u32



call->operation_ID is sometimes being used as __be32 sometimes is being
used as u32.  Be consistent and settle on using as u32.

Signed-off-by: David Howells <dhowells@redhat.com.>

parent 07096f61

fs/afs/cmservice.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -91,11 +91,9 @@ static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {
		*/
		bool afs_cm_incoming_call(struct afs_call *call)
		{
		u32 operation_id = ntohl(call->operation_ID);
		_enter("{CB.OP %u}", call->operation_ID);

		_enter("{CB.OP %u}", operation_id);

		switch (operation_id) {
		switch (call->operation_ID) {
		case CBCallBack:
		call->type = &afs_SRXCBCallBack;
		return true;

fs/afs/internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ struct afs_call {
		bool need_attention; /* T if RxRPC poked us */
		u16 service_id; /* RxRPC service ID to call */
		__be16 port; /* target UDP port */
		__be32 operation_ID; /* operation ID for an incoming call */
		u32 operation_ID; /* operation ID for an incoming call */
		u32 count; /* count for use in unmarshalling */
		__be32 tmp; /* place to extract temporary data */
		afs_dataversion_t store_version; /* updated version expected from store */

fs/afs/rxrpc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -676,10 +676,11 @@ static int afs_deliver_cm_op_id(struct afs_call *call)
		ASSERTCMP(call->offset, <, 4);

		/* the operation ID forms the first four bytes of the request data */
		ret = afs_extract_data(call, &call->operation_ID, 4, true);
		ret = afs_extract_data(call, &call->tmp, 4, true);
		if (ret < 0)
		return ret;

		call->operation_ID = ntohl(call->tmp);
		call->state = AFS_CALL_AWAIT_REQUEST;
		call->offset = 0;