From 0f4ce96cff3f8f4bd0b32a1d54958058b2ca6a44 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 6 Feb 2012 10:31:35 -0500 Subject: [PATCH] --- yaml --- r: 294442 b: refs/heads/master c: 85c0d24f026ca6935897694be4eb0b5c514b907d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/sunrpc.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5a6d1c9c64fa..bba69ee0b1ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4980e7840176b4baa60715c32c5994b084ea9a6 +refs/heads/master: 85c0d24f026ca6935897694be4eb0b5c514b907d diff --git a/trunk/include/trace/events/sunrpc.h b/trunk/include/trace/events/sunrpc.h index 51cc9490919f..ec8668d978d9 100644 --- a/trunk/include/trace/events/sunrpc.h +++ b/trunk/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) ) );