summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 19:31:35 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 19:31:35 +0400
commit85c0d24f026ca6935897694be4eb0b5c514b907d (patch)
tree1f70f139d093624630c59d1a85054a6a3cc65320
parenta4980e7840176b4baa60715c32c5994b084ea9a6 (diff)
downloadlinux-85c0d24f026ca6935897694be4eb0b5c514b907d.tar.xz
SUNRPC: Fix up sunrpc trace events
The reporting of the RPC queue name needs to use the __string() event interface. Reported-by: Neil Horman <nhorman@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--include/trace/events/sunrpc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 51cc9490919f..ec8668d978d9 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -75,21 +75,21 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
TP_STRUCT__entry(
__field(const struct rpc_clnt *, clnt)
__field(const struct rpc_task *, task)
- __field(const struct rpc_wait_queue *, queue)
__field(unsigned long, timeout)
__field(unsigned long, runstate)
__field(int, status)
__field(unsigned short, flags)
+ __string(q_name, rpc_qname(q))
),
TP_fast_assign(
__entry->clnt = clnt;
__entry->task = task;
- __entry->queue = q;
__entry->timeout = task->tk_timeout;
__entry->runstate = task->tk_runstate;
__entry->status = task->tk_status;
__entry->flags = task->tk_flags;
+ __assign_str(q_name, rpc_qname(q));
),
TP_printk("task:%p@%p flags=%4.4x state=%4.4lx status=%d timeout=%lu queue=%s",
@@ -99,7 +99,7 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
__entry->runstate,
__entry->status,
__entry->timeout,
- rpc_qname(__entry->queue)
+ __get_str(q_name)
)
);