openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
David Howells 2016-10-13 08:27:10 +01:00
parent 07096f612f
commit 50a2c95381
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/afs/cmservice.c
View File

@ -91,11 +91,9 @@ static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {
*/ */
bool afs_cm_incoming_call(struct afs_call *call) 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 (call->operation_ID) {
switch (operation_id) {
case CBCallBack: case CBCallBack:
call->type = &afs_SRXCBCallBack; call->type = &afs_SRXCBCallBack;
return true; return true;

2
fs/afs/internal.h
View File

@ -112,7 +112,7 @@ struct afs_call {
bool need_attention; /* T if RxRPC poked us */ bool need_attention; /* T if RxRPC poked us */
u16 service_id; /* RxRPC service ID to call */ u16 service_id; /* RxRPC service ID to call */
__be16 port; /* target UDP port */ __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 */ u32 count; /* count for use in unmarshalling */
__be32 tmp; /* place to extract temporary data */ __be32 tmp; /* place to extract temporary data */
afs_dataversion_t store_version; /* updated version expected from store */ afs_dataversion_t store_version; /* updated version expected from store */

3
fs/afs/rxrpc.c
View File

@ -676,10 +676,11 @@ static int afs_deliver_cm_op_id(struct afs_call *call)
ASSERTCMP(call->offset, <, 4); ASSERTCMP(call->offset, <, 4);
/* the operation ID forms the first four bytes of the request data */ /* 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) if (ret < 0)
return ret; return ret;
call->operation_ID = ntohl(call->tmp);
call->state = AFS_CALL_AWAIT_REQUEST; call->state = AFS_CALL_AWAIT_REQUEST;
call->offset = 0; call->offset = 0;