diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:27:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:27:11 +0100 |
| commit | bfdd5537dcc857eaa04c055ef8afcb8a80dea831 (patch) | |
| tree | 6336969fb04fcd0db4bcbef529f318a86dc9f7c8 /fs/afs/rxrpc.c | |
| parent | sched/core: Explain sleep/wakeup in a better way (diff) | |
| parent | Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| download | linux-bfdd5537dcc857eaa04c055ef8afcb8a80dea831.tar.xz linux-bfdd5537dcc857eaa04c055ef8afcb8a80dea831.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/afs/rxrpc.c')
| -rw-r--r-- | fs/afs/rxrpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 477928b25940..25f05a8d21b1 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -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; |