From cc7f34b2c674f1648b287da8166e96c571baf45a Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 11 Sep 2007 18:00:25 -0400
Subject: [PATCH] --- yaml --- r: 69207 b: refs/heads/master c:
 d66968f207b6402fd12c20145cb31dbe3608979c h: refs/heads/master i:   69205:
 a42e063783ea6fc8284ca1037b746358a9477612   69203:
 0bb8b5a98c6be9eb933676c2032d9ae83d2c9c62   69199:
 e3e44588200b984a442b8f3ce1aa9868656c4f53 v: v3

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

diff --git a/[refs] b/[refs]
index 301e56ce0e7f..b1111d400c23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b8d2552d50f802a3277137a565febcd59ef037
+refs/heads/master: d66968f207b6402fd12c20145cb31dbe3608979c
diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c
index 0357819ffdb0..7a7cd3b7acce 100644
--- a/trunk/net/sunrpc/clnt.c
+++ b/trunk/net/sunrpc/clnt.c
@@ -1526,13 +1526,18 @@ void rpc_show_tasks(void)
 		spin_lock(&clnt->cl_lock);
 		list_for_each_entry(t, &clnt->cl_tasks, tk_task) {
 			const char *rpc_waitq = "none";
+			int proc;
+
+			if (t->tk_msg.rpc_proc)
+				proc = t->tk_msg.rpc_proc->p_proc;
+			else
+				proc = -1;
 
 			if (RPC_IS_QUEUED(t))
 				rpc_waitq = rpc_qname(t->u.tk_wait.rpc_waitq);
 
 			printk("%5u %04d %04x %6d %8p %6d %8p %8ld %8s %8p %8p\n",
-				t->tk_pid,
-				(t->tk_msg.rpc_proc ? t->tk_msg.rpc_proc->p_proc : -1),
+				t->tk_pid, proc,
 				t->tk_flags, t->tk_status,
 				t->tk_client,
 				(t->tk_client ? t->tk_client->cl_prog : 0),