2 files changed, 10 insertions, 7 deletions

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index edc5c887a44c..45556fe771c3 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -519,10 +519,10 @@ TRACE_EVENT(rxrpc_local,
             );
 
 TRACE_EVENT(rxrpc_peer,
-            TP_PROTO(struct rxrpc_peer *peer, enum rxrpc_peer_trace op,
+            TP_PROTO(unsigned int peer_debug_id, enum rxrpc_peer_trace op,
                      int usage, const void *where),
 
-            TP_ARGS(peer, op, usage, where),
+            TP_ARGS(peer_debug_id, op, usage, where),
 
             TP_STRUCT__entry(
                     __field(unsigned int,       peer            )
@@ -532,7 +532,7 @@ TRACE_EVENT(rxrpc_peer,
                              ),
 
             TP_fast_assign(
-                    __entry->peer = peer->debug_id;
+                    __entry->peer = peer_debug_id;
                     __entry->op = op;
                     __entry->usage = usage;
                     __entry->where = where;
diff --git a/net/rxrpc/peer_object.c b/net/rxrpc/peer_object.c
index 9c3ac96f71cb..b700b7ecaa3d 100644
--- a/net/rxrpc/peer_object.c
+++ b/net/rxrpc/peer_object.c
@@ -382,7 +382,7 @@ struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *peer)
         int n;
 
         n = atomic_inc_return(&peer->usage);
-        trace_rxrpc_peer(peer, rxrpc_peer_got, n, here);
+        trace_rxrpc_peer(peer->debug_id, rxrpc_peer_got, n, here);
         return peer;
 }
 
@@ -396,7 +396,7 @@ struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *peer)
         if (peer) {
                 int n = atomic_fetch_add_unless(&peer->usage, 1, 0);
                 if (n > 0)
-                        trace_rxrpc_peer(peer, rxrpc_peer_got, n + 1, here);
+                        trace_rxrpc_peer(peer->debug_id, rxrpc_peer_got, n + 1, here);
                 else
                         peer = NULL;
         }
@@ -426,11 +426,13 @@ static void __rxrpc_put_peer(struct rxrpc_peer *peer)
 void rxrpc_put_peer(struct rxrpc_peer *peer)
 {
         const void *here = __builtin_return_address(0);
+        unsigned int debug_id;
         int n;
 
         if (peer) {
+                debug_id = peer->debug_id;
                 n = atomic_dec_return(&peer->usage);
-                trace_rxrpc_peer(peer, rxrpc_peer_put, n, here);
+                trace_rxrpc_peer(debug_id, rxrpc_peer_put, n, here);
                 if (n == 0)
                         __rxrpc_put_peer(peer);
         }
@@ -443,10 +445,11 @@ void rxrpc_put_peer(struct rxrpc_peer *peer)
 void rxrpc_put_peer_locked(struct rxrpc_peer *peer)
 {
         const void *here = __builtin_return_address(0);
+        unsigned int debug_id = peer->debug_id;
         int n;
 
         n = atomic_dec_return(&peer->usage);
-        trace_rxrpc_peer(peer, rxrpc_peer_put, n, here);
+        trace_rxrpc_peer(debug_id, rxrpc_peer_put, n, here);
         if (n == 0) {
                 hash_del_rcu(&peer->hash_link);
                 list_del_init(&peer->keepalive_link);