From 2a58486712a3d68d9852c297c07c2c9367464233 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 21 Dec 2010 10:52:24 -0500
Subject: [PATCH] --- yaml --- r: 229203 b: refs/heads/master c:
 b3bcedadf23264c3b7afcbfbfe1965a17ef1352c h: refs/heads/master i:   229201:
 ef8932f18aa89f39d5be1610b693f77ade48f433   229199:
 57ea717535480640631074165f98f7d235e1a223 v: v3

---
 [refs]                  |  2 +-
 trunk/net/sunrpc/clnt.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c39e93c4028b..d18d86c950dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa69947399a119d7f1b35bbcd62c849839b35449
+refs/heads/master: b3bcedadf23264c3b7afcbfbfe1965a17ef1352c
diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c
index 4e8210dcda72..57d344cf2256 100644
--- a/trunk/net/sunrpc/clnt.c
+++ b/trunk/net/sunrpc/clnt.c
@@ -1829,23 +1829,15 @@ static void rpc_show_task(const struct rpc_clnt *clnt,
 			  const struct rpc_task *task)
 {
 	const char *rpc_waitq = "none";
-	char *p, action[KSYM_SYMBOL_LEN];
 
 	if (RPC_IS_QUEUED(task))
 		rpc_waitq = rpc_qname(task->tk_waitqueue);
 
-	/* map tk_action pointer to a function name; then trim off
-	 * the "+0x0 [sunrpc]" */
-	sprint_symbol(action, (unsigned long)task->tk_action);
-	p = strchr(action, '+');
-	if (p)
-		*p = '\0';
-
-	printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %sv%u %s a:%s q:%s\n",
+	printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %sv%u %s a:%ps q:%s\n",
 		task->tk_pid, task->tk_flags, task->tk_status,
 		clnt, task->tk_rqstp, task->tk_timeout, task->tk_ops,
 		clnt->cl_protname, clnt->cl_vers, rpc_proc_name(task),
-		action, rpc_waitq);
+		task->tk_action, rpc_waitq);
 }
 
 void rpc_show_tasks(void)