rxrpc: Fold __rxrpc_unuse_local() into rxrpc_unuse_local()

Fold __rxrpc_unuse_local() into rxrpc_unuse_local() as the latter is now
the only user of the former.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 785cd0dd1eea15372903dc4cb27e90d5a410cc32..2a4928249a64ec5e031ba47d5890c9a42a59c012 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -1002,18 +1002,6 @@ void rxrpc_unuse_local(struct rxrpc_local *, enum rxrpc_local_trace);
 void rxrpc_destroy_local(struct rxrpc_local *local);
 void rxrpc_destroy_all_locals(struct rxrpc_net *);
 
-static inline bool __rxrpc_unuse_local(struct rxrpc_local *local,
-                                      enum rxrpc_local_trace why)
-{
-       unsigned int debug_id = local->debug_id;
-       int r, u;
-
-       r = refcount_read(&local->ref);
-       u = atomic_dec_return(&local->active_users);
-       trace_rxrpc_local(debug_id, why, r, u);
-       return u == 0;
-}
-
 static inline bool __rxrpc_use_local(struct rxrpc_local *local,
                                     enum rxrpc_local_trace why)
 {

diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index c73a5a1bc0881a36da1925971947041cb029d6e9..1e994a83db2b4c58446ebceeec1a461f5733371b 100644 (file)
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -359,8 +359,16 @@ struct rxrpc_local *rxrpc_use_local(struct rxrpc_local *local,
  */
 void rxrpc_unuse_local(struct rxrpc_local *local, enum rxrpc_local_trace why)
 {
-       if (local && __rxrpc_unuse_local(local, why))
-               kthread_stop(local->io_thread);
+       unsigned int debug_id = local->debug_id;
+       int r, u;
+
+       if (local) {
+               r = refcount_read(&local->ref);
+               u = atomic_dec_return(&local->active_users);
+               trace_rxrpc_local(debug_id, why, r, u);
+               if (u == 0)
+                       kthread_stop(local->io_thread);
+       }
 }
 
 /*