Hi all,
After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) produced this warning:
Introduced by commit
033b2c7f0f26 ("rxrpc: Add missing "new peer" trace")
interacting with commit
55f6c98e3674 ("rxrpc: Fix trace-after-put looking at the put peer record")
from the net tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 8 Oct 2019 09:37:50 +1100
Subject: [PATCH] rxrpc: fix up for "rxrpc: Fix trace-after-put looking at the
put peer record"
interacting with commit
033b2c7f0f26 ("rxrpc: Add missing "new peer" trace")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
net/rxrpc/peer_object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/peer_object.c b/net/rxrpc/peer_object.c
index a7f1a2cdd198..452163eadb98 100644
--- a/net/rxrpc/peer_object.c
+++ b/net/rxrpc/peer_object.c
@@ -231,7 +231,7 @@ struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp)
peer->cong_cwnd = 3;
else
peer->cong_cwnd = 4;
- trace_rxrpc_peer(peer, rxrpc_peer_new, 1, here);
+ trace_rxrpc_peer(peer->debug_id, rxrpc_peer_new, 1, here);
}
_leave(" = %p", peer);
--
2.23.0.rc1
--
Cheers,
Stephen Rothwell
Attachment:
pgp3UIzNST8eY.pgp
Description: OpenPGP digital signature
