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: 47c810a79844 ("rxrpc: trace: Don't use __builtin_return_address for rxrpc_peer tracing")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 049b52e7aa6afcd339d2ef2045cf0f93afcc548a..c6cfed00d0c6c4e3efb3be88b21e727ea2dcc7d1 100644 (file)
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -471,7 +471,7 @@ TRACE_EVENT(rxrpc_peer,
            TP_STRUCT__entry(
                    __field(unsigned int,       peer            )
                    __field(int,                ref             )
-                   __field(int,                why             )
+                   __field(enum rxrpc_peer_trace, why          )
                             ),
 
            TP_fast_assign(

diff --git a/net/rxrpc/peer_object.c b/net/rxrpc/peer_object.c
index 82de295393a05ae2b2aad42dbc9627c3a450c93c..4eecea2be307b60baedf511f32121c49edd62ae8 100644 (file)
--- a/net/rxrpc/peer_object.c
+++ b/net/rxrpc/peer_object.c
@@ -226,7 +226,7 @@ struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp,
                rxrpc_peer_init_rtt(peer);
 
                peer->cong_ssthresh = RXRPC_TX_MAX_WINDOW;
-               trace_rxrpc_peer(peer->debug_id, why, 1);
+               trace_rxrpc_peer(peer->debug_id, 1, why);
        }
 
        _leave(" = %p", peer);
@@ -382,7 +382,7 @@ struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *peer, enum rxrpc_peer_trace
        int r;
 
        __refcount_inc(&peer->ref, &r);
-       trace_rxrpc_peer(peer->debug_id, why, r + 1);
+       trace_rxrpc_peer(peer->debug_id, r + 1, why);
        return peer;
 }