Skip to content

Commit c838f1a

Browse files
dhowellsdavem330
authored andcommitted
rxrpc: Fix switched parameters in peer tracing
Fix the switched parameters on rxrpc_alloc_peer() and rxrpc_get_peer(). The ref argument and the why argument got mixed. Fixes: 47c810a ("rxrpc: trace: Don't use __builtin_return_address for rxrpc_peer tracing") Signed-off-by: David Howells <[email protected]> cc: Marc Dionne <[email protected]> cc: [email protected] Signed-off-by: David S. Miller <[email protected]>
1 parent 608aecd commit c838f1a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/trace/events/rxrpc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ TRACE_EVENT(rxrpc_peer,
471471
TP_STRUCT__entry(
472472
__field(unsigned int, peer )
473473
__field(int, ref )
474-
__field(int, why )
474+
__field(enum rxrpc_peer_trace, why )
475475
),
476476

477477
TP_fast_assign(

net/rxrpc/peer_object.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp,
226226
rxrpc_peer_init_rtt(peer);
227227

228228
peer->cong_ssthresh = RXRPC_TX_MAX_WINDOW;
229-
trace_rxrpc_peer(peer->debug_id, why, 1);
229+
trace_rxrpc_peer(peer->debug_id, 1, why);
230230
}
231231

232232
_leave(" = %p", peer);
@@ -382,7 +382,7 @@ struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *peer, enum rxrpc_peer_trace
382382
int r;
383383

384384
__refcount_inc(&peer->ref, &r);
385-
trace_rxrpc_peer(peer->debug_id, why, r + 1);
385+
trace_rxrpc_peer(peer->debug_id, r + 1, why);
386386
return peer;
387387
}
388388

0 commit comments

Comments
 (0)