treewide: Add missing semicolons to __assign_str uses

[linux-2.6-microblaze.git] / include / trace / events / sunrpc.h

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index bda16e9..861f199 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -154,8 +154,8 @@ TRACE_EVENT(rpc_clnt_new,
                __entry->client_id = clnt->cl_clid;
                __assign_str(addr, xprt->address_strings[RPC_DISPLAY_ADDR]);
                __assign_str(port, xprt->address_strings[RPC_DISPLAY_PORT]);
-               __assign_str(program, program)
-               __assign_str(server, server)
+               __assign_str(program, program);
+               __assign_str(server, server);
        ),
 
        TP_printk("client=%u peer=[%s]:%s program=%s server=%s",
@@ -180,8 +180,8 @@ TRACE_EVENT(rpc_clnt_new_err,
 
        TP_fast_assign(
                __entry->error = error;
-               __assign_str(program, program)
-               __assign_str(server, server)
+               __assign_str(program, program);
+               __assign_str(server, server);
        ),
 
        TP_printk("program=%s server=%s error=%d",
@@ -284,8 +284,8 @@ TRACE_EVENT(rpc_request,
                __entry->client_id = task->tk_client->cl_clid;
                __entry->version = task->tk_client->cl_vers;
                __entry->async = RPC_IS_ASYNC(task);
-               __assign_str(progname, task->tk_client->cl_program->name)
-               __assign_str(procname, rpc_proc_name(task))
+               __assign_str(progname, task->tk_client->cl_program->name);
+               __assign_str(procname, rpc_proc_name(task));
        ),
 
        TP_printk("task:%u@%u %sv%d %s (%ssync)",
@@ -494,10 +494,10 @@ DECLARE_EVENT_CLASS(rpc_reply_event,
                __entry->task_id = task->tk_pid;
                __entry->client_id = task->tk_client->cl_clid;
                __entry->xid = be32_to_cpu(task->tk_rqstp->rq_xid);
-               __assign_str(progname, task->tk_client->cl_program->name)
+               __assign_str(progname, task->tk_client->cl_program->name);
                __entry->version = task->tk_client->cl_vers;
-               __assign_str(procname, rpc_proc_name(task))
-               __assign_str(servername, task->tk_xprt->servername)
+               __assign_str(procname, rpc_proc_name(task));
+               __assign_str(servername, task->tk_xprt->servername);
        ),
 
        TP_printk("task:%u@%d server=%s xid=0x%08x %sv%d %s",
@@ -622,8 +622,8 @@ TRACE_EVENT(rpc_stats_latency,
                __entry->task_id = task->tk_pid;
                __entry->xid = be32_to_cpu(task->tk_rqstp->rq_xid);
                __entry->version = task->tk_client->cl_vers;
-               __assign_str(progname, task->tk_client->cl_program->name)
-               __assign_str(procname, rpc_proc_name(task))
+               __assign_str(progname, task->tk_client->cl_program->name);
+               __assign_str(procname, rpc_proc_name(task));
                __entry->backlog = ktime_to_us(backlog);
                __entry->rtt = ktime_to_us(rtt);
                __entry->execute = ktime_to_us(execute);
@@ -669,15 +669,15 @@ TRACE_EVENT(rpc_xdr_overflow,
                        __entry->task_id = task->tk_pid;
                        __entry->client_id = task->tk_client->cl_clid;
                        __assign_str(progname,
-                                    task->tk_client->cl_program->name)
+                                    task->tk_client->cl_program->name);
                        __entry->version = task->tk_client->cl_vers;
-                       __assign_str(procedure, task->tk_msg.rpc_proc->p_name)
+                       __assign_str(procedure, task->tk_msg.rpc_proc->p_name);
                } else {
                        __entry->task_id = 0;
                        __entry->client_id = 0;
-                       __assign_str(progname, "unknown")
+                       __assign_str(progname, "unknown");
                        __entry->version = 0;
-                       __assign_str(procedure, "unknown")
+                       __assign_str(procedure, "unknown");
                }
                __entry->requested = requested;
                __entry->end = xdr->end;
@@ -735,9 +735,9 @@ TRACE_EVENT(rpc_xdr_alignment,
                __entry->task_id = task->tk_pid;
                __entry->client_id = task->tk_client->cl_clid;
                __assign_str(progname,
-                            task->tk_client->cl_program->name)
+                            task->tk_client->cl_program->name);
                __entry->version = task->tk_client->cl_vers;
-               __assign_str(procedure, task->tk_msg.rpc_proc->p_name)
+               __assign_str(procedure, task->tk_msg.rpc_proc->p_name);
 
                __entry->offset = offset;
                __entry->copied = copied;
@@ -1079,6 +1079,46 @@ TRACE_EVENT(xprt_transmit,
                __entry->seqno, __entry->status)
 );
 
+TRACE_EVENT(xprt_retransmit,
+       TP_PROTO(
+               const struct rpc_rqst *rqst
+       ),
+
+       TP_ARGS(rqst),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, task_id)
+               __field(unsigned int, client_id)
+               __field(u32, xid)
+               __field(int, ntrans)
+               __field(int, version)
+               __string(progname,
+                        rqst->rq_task->tk_client->cl_program->name)
+               __string(procedure,
+                        rqst->rq_task->tk_msg.rpc_proc->p_name)
+       ),
+
+       TP_fast_assign(
+               struct rpc_task *task = rqst->rq_task;
+
+               __entry->task_id = task->tk_pid;
+               __entry->client_id = task->tk_client ?
+                       task->tk_client->cl_clid : -1;
+               __entry->xid = be32_to_cpu(rqst->rq_xid);
+               __entry->ntrans = rqst->rq_ntrans;
+               __assign_str(progname,
+                            task->tk_client->cl_program->name);
+               __entry->version = task->tk_client->cl_vers;
+               __assign_str(procedure, task->tk_msg.rpc_proc->p_name);
+       ),
+
+       TP_printk(
+               "task:%u@%u xid=0x%08x %sv%d %s ntrans=%d",
+               __entry->task_id, __entry->client_id, __entry->xid,
+               __get_str(progname), __entry->version, __get_str(procedure),
+               __entry->ntrans)
+);
+
 TRACE_EVENT(xprt_ping,
        TP_PROTO(const struct rpc_xprt *xprt, int status),
 
@@ -1141,7 +1181,6 @@ DECLARE_EVENT_CLASS(xprt_writelock_event,
 
 DEFINE_WRITELOCK_EVENT(reserve_xprt);
 DEFINE_WRITELOCK_EVENT(release_xprt);
-DEFINE_WRITELOCK_EVENT(transmit_queued);
 
 DECLARE_EVENT_CLASS(xprt_cong_event,
        TP_PROTO(
@@ -1803,7 +1842,7 @@ TRACE_EVENT(svc_xprt_accept,
 
        TP_fast_assign(
                __assign_str(addr, xprt->xpt_remotebuf);
-               __assign_str(protocol, xprt->xpt_class->xcl_name)
+               __assign_str(protocol, xprt->xpt_class->xcl_name);
                __assign_str(service, service);
        ),