rxrpc: Fix returns of call completion helpers
authorDavid Howells <dhowells@redhat.com>
Wed, 7 Sep 2016 15:34:12 +0000 (16:34 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 7 Sep 2016 15:34:30 +0000 (16:34 +0100)
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>
net/rxrpc/ar-internal.h

index 3addda4bfa6bb89b0bde2b334229e044b2031c1c..0353399792b663a8b1b5c745fb9e93e6ed7eedfa 100644 (file)
@@ -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;
 }
 
 /*