diff options
| author | David Howells | 2016-09-07 17:34:12 +0200 |
|---|---|---|
| committer | David Howells | 2016-09-07 17:34:30 +0200 |
| commit | e8d6bbb05aa5cb985c3661d0db4f858f1d251326 (patch) | |
| tree | f1f7aacd6240934d9c7bc7c1534433dd602919da /net | |
| parent | rxrpc: Calls shouldn't hold socket refs (diff) | |
| download | kernel-qcow2-linux-e8d6bbb05aa5cb985c3661d0db4f858f1d251326.tar.gz kernel-qcow2-linux-e8d6bbb05aa5cb985c3661d0db4f858f1d251326.tar.xz kernel-qcow2-linux-e8d6bbb05aa5cb985c3661d0db4f858f1d251326.zip | |
rxrpc: Fix returns of call completion helpers
rxrpc_set_call_completion() returns bool, not int, so the ret variable
should match this.
rxrpc_call_completed() and __rxrpc_call_completed() should return the value
of rxrpc_set_call_completion().
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rxrpc/ar-internal.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 3addda4bfa6b..0353399792b6 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -608,7 +608,7 @@ static inline bool rxrpc_set_call_completion(struct rxrpc_call *call, u32 abort_code, int error) { - int ret; + bool ret; write_lock_bh(&call->state_lock); ret = __rxrpc_set_call_completion(call, compl, abort_code, error); @@ -619,16 +619,19 @@ static inline bool rxrpc_set_call_completion(struct rxrpc_call *call, /* * Record that a call successfully completed. */ -static inline void __rxrpc_call_completed(struct rxrpc_call *call) +static inline bool __rxrpc_call_completed(struct rxrpc_call *call) { - __rxrpc_set_call_completion(call, RXRPC_CALL_SUCCEEDED, 0, 0); + return __rxrpc_set_call_completion(call, RXRPC_CALL_SUCCEEDED, 0, 0); } -static inline void rxrpc_call_completed(struct rxrpc_call *call) +static inline bool rxrpc_call_completed(struct rxrpc_call *call) { + bool ret; + write_lock_bh(&call->state_lock); - __rxrpc_call_completed(call); + ret = __rxrpc_call_completed(call); write_unlock_bh(&call->state_lock); + return ret; } /* |