afs: Fix some tracing details

[ Upstream commit 4636cf184d6d9a92a56c2554681ea520dd4fe49a ]

Fix a couple of tracelines to indicate the usage count after the atomic op,
not the usage count before it to be consistent with other afs and rxrpc
trace lines.

Change the wording of the afs_call_trace_work trace ID label from "WORK" to
"QUEUE" to reflect the fact that it's queueing work, not doing work.

Fixes: 341f741f04be ("afs: Refcount the afs_call struct")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index ccc9c708a860a5d5c405a7198e9a29110f4dc390..7dc9c78a1c31cac07c13f5516a9cc88b4861b2a6 100644 (file)
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -173,7 +173,7 @@ void afs_put_call(struct afs_call *call)
        int n = atomic_dec_return(&call->usage);
        int o = atomic_read(&afs_outstanding_calls);
 
-       trace_afs_call(call, afs_call_trace_put, n + 1, o,
+       trace_afs_call(call, afs_call_trace_put, n, o,
                       __builtin_return_address(0));
 
        ASSERTCMP(n, >=, 0);
@@ -619,7 +619,7 @@ static void afs_wake_up_async_call(struct sock *sk, struct rxrpc_call *rxcall,
 
        u = __atomic_add_unless(&call->usage, 1, 0);
        if (u != 0) {
-               trace_afs_call(call, afs_call_trace_wake, u,
+               trace_afs_call(call, afs_call_trace_wake, u + 1,
                               atomic_read(&afs_outstanding_calls),
                               __builtin_return_address(0));
 

diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h
index 8b95c16b70454ac875ef5ee3ff8d9df16b78e48b..0978bdae2243b5d0b5f1e66ee89752f8daf866c3 100644 (file)
--- a/include/trace/events/afs.h
+++ b/include/trace/events/afs.h
@@ -40,7 +40,7 @@ enum afs_call_trace {
        EM(afs_call_trace_free,                 "FREE ") \
        EM(afs_call_trace_put,                  "PUT  ") \
        EM(afs_call_trace_wake,                 "WAKE ") \
-       E_(afs_call_trace_work,                 "WORK ")
+       E_(afs_call_trace_work,                 "QUEUE")
 
 /*
  * Export enum symbols via userspace.