SUNRPC: fix print format for tk_pid

The tk_pid field is an unsigned short.  The proper print format specifier for
that type is %5u, not %4d.

Also clean up some miscellaneous print formatting nits.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

10 files changed, 228 insertions, 198 deletions

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 993ff1a5d94..5752f294751 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -181,7 +181,7 @@ rpcauth_gc_credcache(struct rpc_auth *auth, struct hlist_head *free)
         struct rpc_cred *cred;
         int             i;
 
-        dprintk("RPC: gc'ing RPC credentials for auth %p\n", auth);
+        dprintk("RPC:       gc'ing RPC credentials for auth %p\n", auth);
         for (i = 0; i < RPC_CREDCACHE_NR; i++) {
                 hlist_for_each_safe(pos, next, &cache->hashtable[i]) {
                         cred = hlist_entry(pos, struct rpc_cred, cr_hash);
@@ -267,7 +267,7 @@ rpcauth_lookupcred(struct rpc_auth *auth, int flags)
         };
         struct rpc_cred *ret;
 
-        dprintk("RPC:     looking up %s cred\n",
+        dprintk("RPC:       looking up %s cred\n",
                 auth->au_ops->au_name);
         get_group_info(acred.group_info);
         ret = auth->au_ops->lookup_cred(auth, &acred, flags);
@@ -287,7 +287,7 @@ rpcauth_bindcred(struct rpc_task *task)
         struct rpc_cred *ret;
         int flags = 0;
 
-        dprintk("RPC: %4d looking up %s cred\n",
+        dprintk("RPC: %5u looking up %s cred\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name);
         get_group_info(acred.group_info);
         if (task->tk_flags & RPC_TASK_ROOTCREDS)
@@ -304,8 +304,9 @@ rpcauth_bindcred(struct rpc_task *task)
 void
 rpcauth_holdcred(struct rpc_task *task)
 {
-        dprintk("RPC: %4d holding %s cred %p\n",
-                task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred);
+        dprintk("RPC: %5u holding %s cred %p\n",
+                task->tk_pid, task->tk_auth->au_ops->au_name,
+                task->tk_msg.rpc_cred);
         if (task->tk_msg.rpc_cred)
                 get_rpccred(task->tk_msg.rpc_cred);
 }
@@ -324,7 +325,7 @@ rpcauth_unbindcred(struct rpc_task *task)
 {
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
 
-        dprintk("RPC: %4d releasing %s cred %p\n",
+        dprintk("RPC: %5u releasing %s cred %p\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name, cred);
 
         put_rpccred(cred);
@@ -336,7 +337,7 @@ rpcauth_marshcred(struct rpc_task *task, __be32 *p)
 {
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
 
-        dprintk("RPC: %4d marshaling %s cred %p\n",
+        dprintk("RPC: %5u marshaling %s cred %p\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name, cred);
 
         return cred->cr_ops->crmarshal(task, p);
@@ -347,7 +348,7 @@ rpcauth_checkverf(struct rpc_task *task, __be32 *p)
 {
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
 
-        dprintk("RPC: %4d validating %s cred %p\n",
+        dprintk("RPC: %5u validating %s cred %p\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name, cred);
 
         return cred->cr_ops->crvalidate(task, p);
@@ -359,7 +360,7 @@ rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp,
 {
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
 
-        dprintk("RPC: %4d using %s cred %p to wrap rpc data\n",
+        dprintk("RPC: %5u using %s cred %p to wrap rpc data\n",
                         task->tk_pid, cred->cr_ops->cr_name, cred);
         if (cred->cr_ops->crwrap_req)
                 return cred->cr_ops->crwrap_req(task, encode, rqstp, data, obj);
@@ -373,7 +374,7 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp,
 {
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
 
-        dprintk("RPC: %4d using %s cred %p to unwrap rpc data\n",
+        dprintk("RPC: %5u using %s cred %p to unwrap rpc data\n",
                         task->tk_pid, cred->cr_ops->cr_name, cred);
         if (cred->cr_ops->crunwrap_resp)
                 return cred->cr_ops->crunwrap_resp(task, decode, rqstp,
@@ -388,7 +389,7 @@ rpcauth_refreshcred(struct rpc_task *task)
         struct rpc_cred *cred = task->tk_msg.rpc_cred;
         int err;
 
-        dprintk("RPC: %4d refreshing %s cred %p\n",
+        dprintk("RPC: %5u refreshing %s cred %p\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name, cred);
 
         err = cred->cr_ops->crrefresh(task);
@@ -400,7 +401,7 @@ rpcauth_refreshcred(struct rpc_task *task)
 void
 rpcauth_invalcred(struct rpc_task *task)
 {
-        dprintk("RPC: %4d invalidating %s cred %p\n",
+        dprintk("RPC: %5u invalidating %s cred %p\n",
                 task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred);
         spin_lock(&rpc_credcache_lock);
         if (task->tk_msg.rpc_cred)
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index f7f990c9afe..4e7733aee36 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -39,7 +39,8 @@ static struct rpc_credops	unix_credops;
 static struct rpc_auth *
 unx_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
 {
-        dprintk("RPC: creating UNIX authenticator for client %p\n", clnt);
+        dprintk("RPC:       creating UNIX authenticator for client %p\n",
+                        clnt);
         if (atomic_inc_return(&unix_auth.au_count) == 0)
                 unix_cred_cache.nextgc = jiffies + (unix_cred_cache.expire >> 1);
         return &unix_auth;
@@ -48,7 +49,7 @@ unx_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
 static void
 unx_destroy(struct rpc_auth *auth)
 {
-        dprintk("RPC: destroying UNIX authenticator %p\n", auth);
+        dprintk("RPC:       destroying UNIX authenticator %p\n", auth);
         rpcauth_free_credcache(auth);
 }
 
@@ -67,8 +68,8 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         struct unx_cred *cred;
         int             i;
 
-        dprintk("RPC:      allocating UNIX cred for uid %d gid %d\n",
-                                acred->uid, acred->gid);
+        dprintk("RPC:       allocating UNIX cred for uid %d gid %d\n",
+                        acred->uid, acred->gid);
 
         if (!(cred = kmalloc(sizeof(*cred), GFP_KERNEL)))
                 return ERR_PTR(-ENOMEM);
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 14274490f92..9e72223487f 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -215,7 +215,8 @@ int cache_check(struct cache_detail *detail,
                 if (rv == -EAGAIN)
                         rv = -ENOENT;
         } else if (rv == -EAGAIN || age > refresh_age/2) {
-                dprintk("Want update, refage=%ld, age=%ld\n", refresh_age, age);
+                dprintk("RPC:       Want update, refage=%ld, age=%ld\n",
+                                refresh_age, age);
                 if (!test_and_set_bit(CACHE_PENDING, &h->flags)) {
                         switch (cache_make_upcall(detail, h)) {
                         case -EINVAL:
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index e9d5f3c562e..393e70aee18 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -42,6 +42,10 @@
 # define RPCDBG_FACILITY        RPCDBG_CALL
 #endif
 
+#define dprint_status(t)                                        \
+        dprintk("RPC: %5u %s (status %d)\n", t->tk_pid,         \
+                        __FUNCTION__, t->tk_status)
+
 static DECLARE_WAIT_QUEUE_HEAD(destroy_wait);
 
 
@@ -106,8 +110,8 @@ static struct rpc_clnt * rpc_new_client(struct rpc_xprt *xprt, char *servname, s
         int err;
         int len;
 
-        dprintk("RPC: creating %s client for %s (xprt %p)\n",
-                program->name, servname, xprt);
+        dprintk("RPC:       creating %s client for %s (xprt %p)\n",
+                        program->name, servname, xprt);
 
         err = -EINVAL;
         if (!xprt)
@@ -220,7 +224,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                 xprt->resvport = 0;
 
         dprintk("RPC:       creating %s client for %s (xprt %p)\n",
-                args->program->name, args->servername, xprt);
+                        args->program->name, args->servername, xprt);
 
         clnt = rpc_new_client(xprt, args->servername, args->program,
                                 args->version, args->authflavor);
@@ -288,7 +292,7 @@ out_no_path:
 out_no_stats:
         kfree(new);
 out_no_clnt:
-        dprintk("RPC: %s returned error %d\n", __FUNCTION__, err);
+        dprintk("RPC:       %s: returned error %d\n", __FUNCTION__, err);
         return ERR_PTR(err);
 }
 
@@ -301,7 +305,7 @@ out_no_clnt:
 int
 rpc_shutdown_client(struct rpc_clnt *clnt)
 {
-        dprintk("RPC: shutting down %s client for %s, tasks=%d\n",
+        dprintk("RPC:       shutting down %s client for %s, tasks=%d\n",
                         clnt->cl_protname, clnt->cl_server,
                         atomic_read(&clnt->cl_users));
 
@@ -336,7 +340,7 @@ rpc_destroy_client(struct rpc_clnt *clnt)
                 return 1;
         BUG_ON(atomic_read(&clnt->cl_users) != 0);
 
-        dprintk("RPC: destroying %s client for %s\n",
+        dprintk("RPC:       destroying %s client for %s\n",
                         clnt->cl_protname, clnt->cl_server);
         if (clnt->cl_auth) {
                 rpcauth_destroy(clnt->cl_auth);
@@ -366,8 +370,8 @@ out_free:
 void
 rpc_release_client(struct rpc_clnt *clnt)
 {
-        dprintk("RPC:      rpc_release_client(%p, %d)\n",
-                                clnt, atomic_read(&clnt->cl_users));
+        dprintk("RPC:       rpc_release_client(%p, %d)\n",
+                        clnt, atomic_read(&clnt->cl_users));
 
         if (!atomic_dec_and_test(&clnt->cl_users))
                 return;
@@ -654,9 +658,10 @@ call_start(struct rpc_task *task)
 {
         struct rpc_clnt *clnt = task->tk_client;
 
-        dprintk("RPC: %4d call_start %s%d proc %d (%s)\n", task->tk_pid,
-                clnt->cl_protname, clnt->cl_vers, task->tk_msg.rpc_proc->p_proc,
-                (RPC_IS_ASYNC(task) ? "async" : "sync"));
+        dprintk("RPC: %5u call_start %s%d proc %d (%s)\n", task->tk_pid,
+                        clnt->cl_protname, clnt->cl_vers,
+                        task->tk_msg.rpc_proc->p_proc,
+                        (RPC_IS_ASYNC(task) ? "async" : "sync"));
 
         /* Increment call count */
         task->tk_msg.rpc_proc->p_count++;
@@ -670,7 +675,7 @@ call_start(struct rpc_task *task)
 static void
 call_reserve(struct rpc_task *task)
 {
-        dprintk("RPC: %4d call_reserve\n", task->tk_pid);
+        dprint_status(task);
 
         if (!rpcauth_uptodatecred(task)) {
                 task->tk_action = call_refresh;
@@ -690,8 +695,7 @@ call_reserveresult(struct rpc_task *task)
 {
         int status = task->tk_status;
 
-        dprintk("RPC: %4d call_reserveresult (status %d)\n",
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         /*
          * After a call to xprt_reserve(), we must have either
@@ -745,8 +749,8 @@ call_allocate(struct rpc_task *task)
         struct rpc_xprt *xprt = task->tk_xprt;
         unsigned int    bufsiz;
 
-        dprintk("RPC: %4d call_allocate (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
+
         task->tk_action = call_bind;
         if (req->rq_buffer)
                 return;
@@ -757,7 +761,8 @@ call_allocate(struct rpc_task *task)
 
         if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL)
                 return;
-        printk(KERN_INFO "RPC: buffer allocation failed for task %p\n", task); 
+
+        dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid);
 
         if (RPC_IS_ASYNC(task) || !signalled()) {
                 xprt_release(task);
@@ -794,8 +799,7 @@ call_encode(struct rpc_task *task)
         kxdrproc_t      encode;
         __be32          *p;
 
-        dprintk("RPC: %4d call_encode (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         /* Default buffer setup */
         bufsiz = req->rq_bufsize >> 1;
@@ -841,8 +845,7 @@ call_bind(struct rpc_task *task)
 {
         struct rpc_xprt *xprt = task->tk_xprt;
 
-        dprintk("RPC: %4d call_bind (status %d)\n",
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         task->tk_action = call_connect;
         if (!xprt_bound(xprt)) {
@@ -861,8 +864,7 @@ call_bind_status(struct rpc_task *task)
         int status = -EACCES;
 
         if (task->tk_status >= 0) {
-                dprintk("RPC: %4d call_bind_status (status %d)\n",
-                                        task->tk_pid, task->tk_status);
+                dprint_status(task);
                 task->tk_status = 0;
                 task->tk_action = call_connect;
                 return;
@@ -870,24 +872,24 @@ call_bind_status(struct rpc_task *task)
 
         switch (task->tk_status) {
         case -EACCES:
-                dprintk("RPC: %4d remote rpcbind: RPC program/version unavailable\n",
-                                task->tk_pid);
+                dprintk("RPC: %5u remote rpcbind: RPC program/version "
+                                "unavailable\n", task->tk_pid);
                 rpc_delay(task, 3*HZ);
                 goto retry_timeout;
         case -ETIMEDOUT:
-                dprintk("RPC: %4d rpcbind request timed out\n",
+                dprintk("RPC: %5u rpcbind request timed out\n",
                                 task->tk_pid);
                 goto retry_timeout;
         case -EPFNOSUPPORT:
-                dprintk("RPC: %4d remote rpcbind service unavailable\n",
+                dprintk("RPC: %5u remote rpcbind service unavailable\n",
                                 task->tk_pid);
                 break;
         case -EPROTONOSUPPORT:
-                dprintk("RPC: %4d remote rpcbind version 2 unavailable\n",
+                dprintk("RPC: %5u remote rpcbind version 2 unavailable\n",
                                 task->tk_pid);
                 break;
         default:
-                dprintk("RPC: %4d unrecognized rpcbind error (%d)\n",
+                dprintk("RPC: %5u unrecognized rpcbind error (%d)\n",
                                 task->tk_pid, -task->tk_status);
                 status = -EIO;
         }
@@ -907,7 +909,7 @@ call_connect(struct rpc_task *task)
 {
         struct rpc_xprt *xprt = task->tk_xprt;
 
-        dprintk("RPC: %4d call_connect xprt %p %s connected\n",
+        dprintk("RPC: %5u call_connect xprt %p %s connected\n",
                         task->tk_pid, xprt,
                         (xprt_connected(xprt) ? "is" : "is not"));
 
@@ -929,8 +931,7 @@ call_connect_status(struct rpc_task *task)
         struct rpc_clnt *clnt = task->tk_client;
         int status = task->tk_status;
 
-        dprintk("RPC: %5u call_connect_status (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         task->tk_status = 0;
         if (status >= 0) {
@@ -962,8 +963,7 @@ call_connect_status(struct rpc_task *task)
 static void
 call_transmit(struct rpc_task *task)
 {
-        dprintk("RPC: %4d call_transmit (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         task->tk_action = call_status;
         if (task->tk_status < 0)
@@ -1024,8 +1024,7 @@ call_status(struct rpc_task *task)
         if (req->rq_received > 0 && !req->rq_bytes_sent)
                 task->tk_status = req->rq_received;
 
-        dprintk("RPC: %4d call_status (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprint_status(task);
 
         status = task->tk_status;
         if (status >= 0) {
@@ -1076,11 +1075,11 @@ call_timeout(struct rpc_task *task)
         struct rpc_clnt *clnt = task->tk_client;
 
         if (xprt_adjust_timeout(task->tk_rqstp) == 0) {
-                dprintk("RPC: %4d call_timeout (minor)\n", task->tk_pid);
+                dprintk("RPC: %5u call_timeout (minor)\n", task->tk_pid);
                 goto retry;
         }
 
-        dprintk("RPC: %4d call_timeout (major)\n", task->tk_pid);
+        dprintk("RPC: %5u call_timeout (major)\n", task->tk_pid);
         task->tk_timeouts++;
 
         if (RPC_IS_SOFT(task)) {
@@ -1114,8 +1113,8 @@ call_decode(struct rpc_task *task)
         kxdrproc_t      decode = task->tk_msg.rpc_proc->p_decode;
         __be32          *p;
 
-        dprintk("RPC: %4d call_decode (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+        dprintk("RPC: %5u call_decode (status %d)\n",
+                        task->tk_pid, task->tk_status);
 
         if (task->tk_flags & RPC_CALL_MAJORSEEN) {
                 printk(KERN_NOTICE "%s: server %s OK\n",
@@ -1129,8 +1128,8 @@ call_decode(struct rpc_task *task)
                         clnt->cl_stats->rpcretrans++;
                         goto out_retry;
                 }
-                dprintk("%s: too small RPC reply size (%d bytes)\n",
-                        clnt->cl_protname, task->tk_status);
+                dprintk("RPC:       %s: too small RPC reply size (%d bytes)\n",
+                                clnt->cl_protname, task->tk_status);
                 task->tk_action = call_timeout;
                 goto out_retry;
         }
@@ -1162,8 +1161,8 @@ call_decode(struct rpc_task *task)
                                                       task->tk_msg.rpc_resp);
                 unlock_kernel();
         }
-        dprintk("RPC: %4d call_decode result %d\n", task->tk_pid,
-                                        task->tk_status);
+        dprintk("RPC: %5u call_decode result %d\n", task->tk_pid,
+                        task->tk_status);
         return;
 out_retry:
         req->rq_received = req->rq_private_buf.len = 0;
@@ -1176,7 +1175,7 @@ out_retry:
 static void
 call_refresh(struct rpc_task *task)
 {
-        dprintk("RPC: %4d call_refresh\n", task->tk_pid);
+        dprint_status(task);
 
         xprt_release(task);     /* Must do to obtain new XID */
         task->tk_action = call_refreshresult;
@@ -1192,8 +1191,8 @@ static void
 call_refreshresult(struct rpc_task *task)
 {
         int status = task->tk_status;
-        dprintk("RPC: %4d call_refreshresult (status %d)\n", 
-                                task->tk_pid, task->tk_status);
+
+        dprint_status(task);
 
         task->tk_status = 0;
         task->tk_action = call_reserve;
@@ -1271,11 +1270,15 @@ call_verify(struct rpc_task *task)
                         case RPC_AUTH_ERROR:
                                 break;
                         case RPC_MISMATCH:
-                                dprintk("%s: RPC call version mismatch!\n", __FUNCTION__);
+                                dprintk("RPC: %5u %s: RPC call version "
+                                                "mismatch!\n",
+                                                task->tk_pid, __FUNCTION__);
                                 error = -EPROTONOSUPPORT;
                                 goto out_err;
                         default:
-                                dprintk("%s: RPC call rejected, unknown error: %x\n", __FUNCTION__, n);
+                                dprintk("RPC: %5u %s: RPC call rejected, "
+                                                "unknown error: %x\n",
+                                                task->tk_pid, __FUNCTION__, n);
                                 goto out_eio;
                 }
                 if (--len < 0)
@@ -1288,8 +1291,8 @@ call_verify(struct rpc_task *task)
                         if (!task->tk_cred_retry)
                                 break;
                         task->tk_cred_retry--;
-                        dprintk("RPC: %4d call_verify: retry stale creds\n",
-                                                        task->tk_pid);
+                        dprintk("RPC: %5u %s: retry stale creds\n",
+                                        task->tk_pid, __FUNCTION__);
                         rpcauth_invalcred(task);
                         task->tk_action = call_refresh;
                         goto out_retry;
@@ -1299,8 +1302,8 @@ call_verify(struct rpc_task *task)
                         if (!task->tk_garb_retry)
                                 break;
                         task->tk_garb_retry--;
-                        dprintk("RPC: %4d call_verify: retry garbled creds\n",
-                                                        task->tk_pid);
+                        dprintk("RPC: %5u %s: retry garbled creds\n",
+                                        task->tk_pid, __FUNCTION__);
                         task->tk_action = call_bind;
                         goto out_retry;
                 case RPC_AUTH_TOOWEAK:
@@ -1311,8 +1314,8 @@ call_verify(struct rpc_task *task)
                         printk(KERN_WARNING "call_verify: unknown auth error: %x\n", n);
                         error = -EIO;
                 }
-                dprintk("RPC: %4d call_verify: call rejected %d\n",
-                                                task->tk_pid, n);
+                dprintk("RPC: %5u %s: call rejected %d\n",
+                                task->tk_pid, __FUNCTION__, n);
                 goto out_err;
         }
         if (!(p = rpcauth_checkverf(task, p))) {
@@ -1326,20 +1329,24 @@ call_verify(struct rpc_task *task)
         case RPC_SUCCESS:
                 return p;
         case RPC_PROG_UNAVAIL:
-                dprintk("RPC: call_verify: program %u is unsupported by server %s\n",
+                dprintk("RPC: %5u %s: program %u is unsupported by server %s\n",
+                                task->tk_pid, __FUNCTION__,
                                 (unsigned int)task->tk_client->cl_prog,
                                 task->tk_client->cl_server);
                 error = -EPFNOSUPPORT;
                 goto out_err;
         case RPC_PROG_MISMATCH:
-                dprintk("RPC: call_verify: program %u, version %u unsupported by server %s\n",
+                dprintk("RPC: %5u %s: program %u, version %u unsupported by "
+                                "server %s\n", task->tk_pid, __FUNCTION__,
                                 (unsigned int)task->tk_client->cl_prog,
                                 (unsigned int)task->tk_client->cl_vers,
                                 task->tk_client->cl_server);
                 error = -EPROTONOSUPPORT;
                 goto out_err;
         case RPC_PROC_UNAVAIL:
-                dprintk("RPC: call_verify: proc %p unsupported by program %u, version %u on server %s\n",
+                dprintk("RPC: %5u %s: proc %p unsupported by program %u, "
+                                "version %u on server %s\n",
+                                task->tk_pid, __FUNCTION__,
                                 task->tk_msg.rpc_proc,
                                 task->tk_client->cl_prog,
                                 task->tk_client->cl_vers,
@@ -1347,7 +1354,8 @@ call_verify(struct rpc_task *task)
                 error = -EOPNOTSUPP;
                 goto out_err;
         case RPC_GARBAGE_ARGS:
-                dprintk("RPC: %4d %s: server saw garbage\n", task->tk_pid, __FUNCTION__);
+                dprintk("RPC: %5u %s: server saw garbage\n",
+                                task->tk_pid, __FUNCTION__);
                 break;                  /* retry */
         default:
                 printk(KERN_WARNING "call_verify: server accept status: %x\n", n);
@@ -1358,7 +1366,8 @@ out_garbage:
         task->tk_client->cl_stats->rpcgarbage++;
         if (task->tk_garb_retry) {
                 task->tk_garb_retry--;
-                dprintk("RPC %s: retrying %4d\n", __FUNCTION__, task->tk_pid);
+                dprintk("RPC: %5u %s: retrying\n",
+                                task->tk_pid, __FUNCTION__);
                 task->tk_action = call_bind;
 out_retry:
                 return ERR_PTR(-EAGAIN);
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index 76e59e9b8fb..12ab4ec5fc7 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -97,7 +97,7 @@ void rpc_getport(struct rpc_task *task)
         struct rpc_task *child;
         int status;
 
-        dprintk("RPC: %4d rpc_getport(%s, %u, %u, %d)\n",
+        dprintk("RPC: %5u rpc_getport(%s, %u, %u, %d)\n",
                         task->tk_pid, clnt->cl_server,
                         clnt->cl_prog, clnt->cl_vers, xprt->prot);
 
@@ -178,7 +178,7 @@ int rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int pr
         char            hostname[32];
         int             status;
 
-        dprintk("RPC:      rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n",
+        dprintk("RPC:       rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n",
                         NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
 
         sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
@@ -221,7 +221,7 @@ static void pmap_getport_done(struct rpc_task *child, void *data)
                 status = 0;
         }
 
-        dprintk("RPC: %4d pmap_getport_done(status %d, port %u)\n",
+        dprintk("RPC: %5u pmap_getport_done(status %d, port %u)\n",
                         child->tk_pid, status, map->pm_port);
 
         pmap_wake_portmap_waiters(xprt, status);
@@ -257,13 +257,14 @@ int rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
         struct rpc_clnt         *pmap_clnt;
         int error = 0;
 
-        dprintk("RPC: registering (%u, %u, %d, %u) with portmapper.\n",
+        dprintk("RPC:       registering (%u, %u, %d, %u) with portmapper.\n",
                         prog, vers, prot, port);
 
         pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1);
         if (IS_ERR(pmap_clnt)) {
                 error = PTR_ERR(pmap_clnt);
-                dprintk("RPC: couldn't create pmap client. Error = %d\n", error);
+                dprintk("RPC:       couldn't create pmap client. Error = %d\n",
+                                error);
                 return error;
         }
 
@@ -274,7 +275,7 @@ int rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
                         "RPC: failed to contact portmap (errno %d).\n",
                         error);
         }
-        dprintk("RPC: registration status %d/%d\n", error, *okay);
+        dprintk("RPC:       registration status %d/%d\n", error, *okay);
 
         /* Client deleted automatically because cl_oneshot == 1 */
         return error;
@@ -305,8 +306,9 @@ static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr,
  */
 static int xdr_encode_mapping(struct rpc_rqst *req, __be32 *p, struct portmap_args *map)
 {
-        dprintk("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n",
-                map->pm_prog, map->pm_vers, map->pm_prot, map->pm_port);
+        dprintk("RPC:       xdr_encode_mapping(%u, %u, %u, %u)\n",
+                        map->pm_prog, map->pm_vers,
+                        map->pm_prot, map->pm_port);
         *p++ = htonl(map->pm_prog);
         *p++ = htonl(map->pm_vers);
         *p++ = htonl(map->pm_prot);
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 13ab0c6fed0..ca56b8e9b64 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -74,7 +74,7 @@ static DEFINE_SPINLOCK(rpc_sched_lock);
 static inline void
 __rpc_disable_timer(struct rpc_task *task)
 {
-        dprintk("RPC: %4d disabling timer\n", task->tk_pid);
+        dprintk("RPC: %5u disabling timer\n", task->tk_pid);
         task->tk_timeout_fn = NULL;
         task->tk_timeout = 0;
 }
@@ -93,7 +93,7 @@ static void rpc_run_timer(struct rpc_task *task)
         callback = task->tk_timeout_fn;
         task->tk_timeout_fn = NULL;
         if (callback && RPC_IS_QUEUED(task)) {
-                dprintk("RPC: %4d running timer\n", task->tk_pid);
+                dprintk("RPC: %5u running timer\n", task->tk_pid);
                 callback(task);
         }
         smp_mb__before_clear_bit();
@@ -110,7 +110,7 @@ __rpc_add_timer(struct rpc_task *task, rpc_action timer)
         if (!task->tk_timeout)
                 return;
 
-        dprintk("RPC: %4d setting alarm for %lu ms\n",
+        dprintk("RPC: %5u setting alarm for %lu ms\n",
                         task->tk_pid, task->tk_timeout * 1000 / HZ);
 
         if (timer)
@@ -132,7 +132,7 @@ rpc_delete_timer(struct rpc_task *task)
                 return;
         if (test_and_clear_bit(RPC_TASK_HAS_TIMER, &task->tk_runstate)) {
                 del_singleshot_timer_sync(&task->tk_timer);
-                dprintk("RPC: %4d deleting timer\n", task->tk_pid);
+                dprintk("RPC: %5u deleting timer\n", task->tk_pid);
         }
 }
 
@@ -179,8 +179,8 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, struct rpc_task *
         queue->qlen++;
         rpc_set_queued(task);
 
-        dprintk("RPC: %4d added to queue %p \"%s\"\n",
-                                task->tk_pid, queue, rpc_qname(queue));
+        dprintk("RPC: %5u added to queue %p \"%s\"\n",
+                        task->tk_pid, queue, rpc_qname(queue));
 }
 
 /*
@@ -212,8 +212,8 @@ static void __rpc_remove_wait_queue(struct rpc_task *task)
         else
                 list_del(&task->u.tk_wait.list);
         queue->qlen--;
-        dprintk("RPC: %4d removed from queue %p \"%s\"\n",
-                                task->tk_pid, queue, rpc_qname(queue));
+        dprintk("RPC: %5u removed from queue %p \"%s\"\n",
+                        task->tk_pid, queue, rpc_qname(queue));
 }
 
 static inline void rpc_set_waitqueue_priority(struct rpc_wait_queue *queue, int priority)
@@ -344,8 +344,8 @@ static void rpc_make_runnable(struct rpc_task *task)
 static void __rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task,
                         rpc_action action, rpc_action timer)
 {
-        dprintk("RPC: %4d sleep_on(queue \"%s\" time %ld)\n", task->tk_pid,
-                                rpc_qname(q), jiffies);
+        dprintk("RPC: %5u sleep_on(queue \"%s\" time %lu)\n",
+                        task->tk_pid, rpc_qname(q), jiffies);
 
         if (!RPC_IS_ASYNC(task) && !RPC_IS_ACTIVATED(task)) {
                 printk(KERN_ERR "RPC: Inactive synchronous task put to sleep!\n");
@@ -381,7 +381,8 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task,
  */
 static void __rpc_do_wake_up_task(struct rpc_task *task)
 {
-        dprintk("RPC: %4d __rpc_wake_up_task (now %ld)\n", task->tk_pid, jiffies);
+        dprintk("RPC: %5u __rpc_wake_up_task (now %lu)\n",
+                        task->tk_pid, jiffies);
 
 #ifdef RPC_DEBUG
         BUG_ON(task->tk_magic != RPC_TASK_MAGIC_ID);
@@ -397,7 +398,7 @@ static void __rpc_do_wake_up_task(struct rpc_task *task)
 
         rpc_make_runnable(task);
 
-        dprintk("RPC:      __rpc_wake_up_task done\n");
+        dprintk("RPC:       __rpc_wake_up_task done\n");
 }
 
 /*
@@ -418,7 +419,7 @@ static void __rpc_wake_up_task(struct rpc_task *task)
 static void
 __rpc_default_timer(struct rpc_task *task)
 {
-        dprintk("RPC: %d timeout (default timer)\n", task->tk_pid);
+        dprintk("RPC: %5u timeout (default timer)\n", task->tk_pid);
         task->tk_status = -ETIMEDOUT;
         rpc_wake_up_task(task);
 }
@@ -502,7 +503,8 @@ struct rpc_task * rpc_wake_up_next(struct rpc_wait_queue *queue)
 {
         struct rpc_task *task = NULL;
 
-        dprintk("RPC:      wake_up_next(%p \"%s\")\n", queue, rpc_qname(queue));
+        dprintk("RPC:       wake_up_next(%p \"%s\")\n",
+                        queue, rpc_qname(queue));
         rcu_read_lock_bh();
         spin_lock(&queue->lock);
         if (RPC_IS_PRIORITY(queue))
@@ -629,8 +631,8 @@ static void __rpc_execute(struct rpc_task *task)
 {
         int             status = 0;
 
-        dprintk("RPC: %4d rpc_execute flgs %x\n",
-                                task->tk_pid, task->tk_flags);
+        dprintk("RPC: %5u __rpc_execute flags=0x%x\n",
+                        task->tk_pid, task->tk_flags);
 
         BUG_ON(RPC_IS_QUEUED(task));
 
@@ -686,7 +688,7 @@ static void __rpc_execute(struct rpc_task *task)
                 }
 
                 /* sync task: sleep here */
-                dprintk("RPC: %4d sync task going to sleep\n", task->tk_pid);
+                dprintk("RPC: %5u sync task going to sleep\n", task->tk_pid);
                 /* Note: Caller should be using rpc_clnt_sigmask() */
                 status = out_of_line_wait_on_bit(&task->tk_runstate,
                                 RPC_TASK_QUEUED, rpc_wait_bit_interruptible,
@@ -698,16 +700,17 @@ static void __rpc_execute(struct rpc_task *task)
                          * clean up after sleeping on some queue, we don't
                          * break the loop here, but go around once more.
                          */
-                        dprintk("RPC: %4d got signal\n", task->tk_pid);
+                        dprintk("RPC: %5u got signal\n", task->tk_pid);
                         task->tk_flags |= RPC_TASK_KILLED;
                         rpc_exit(task, -ERESTARTSYS);
                         rpc_wake_up_task(task);
                 }
                 rpc_set_running(task);
-                dprintk("RPC: %4d sync task resuming\n", task->tk_pid);
+                dprintk("RPC: %5u sync task resuming\n", task->tk_pid);
         }
 
-        dprintk("RPC: %4d, return %d, status %d\n", task->tk_pid, status, task->tk_status);
+        dprintk("RPC: %5u return %d, status %d\n", task->tk_pid, status,
+                        task->tk_status);
         /* Release all resources associated with the task */
         rpc_release_task(task);
 }
@@ -824,7 +827,7 @@ void rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt, int flags, cons
         /* starting timestamp */
         task->tk_start = jiffies;
 
-        dprintk("RPC: %4d new task procpid %d\n", task->tk_pid,
+        dprintk("RPC:       new task initialized, procpid %u\n",
                                 current->pid);
 }
 
@@ -837,7 +840,7 @@ rpc_alloc_task(void)
 static void rpc_free_task(struct rcu_head *rcu)
 {
         struct rpc_task *task = container_of(rcu, struct rpc_task, u.tk_rcu);
-        dprintk("RPC: %4d freeing task\n", task->tk_pid);
+        dprintk("RPC: %5u freeing task\n", task->tk_pid);
         mempool_free(task, rpc_task_mempool);
 }
 
@@ -856,7 +859,7 @@ struct rpc_task *rpc_new_task(struct rpc_clnt *clnt, int flags, const struct rpc
 
         rpc_init_task(task, clnt, flags, tk_ops, calldata);
 
-        dprintk("RPC: %4d allocated task\n", task->tk_pid);
+        dprintk("RPC:       allocated task %p\n", task);
         task->tk_flags |= RPC_TASK_DYNAMIC;
 out:
         return task;
@@ -900,7 +903,7 @@ static void rpc_release_task(struct rpc_task *task)
 #ifdef RPC_DEBUG
         BUG_ON(task->tk_magic != RPC_TASK_MAGIC_ID);
 #endif
-        dprintk("RPC: %4d release task\n", task->tk_pid);
+        dprintk("RPC: %5u release task\n", task->tk_pid);
 
         /* Remove from global task list */
         spin_lock(&rpc_sched_lock);
@@ -953,7 +956,7 @@ void rpc_killall_tasks(struct rpc_clnt *clnt)
         struct rpc_task *rovr;
         struct list_head *le;
 
-        dprintk("RPC:      killing all tasks for client %p\n", clnt);
+        dprintk("RPC:       killing all tasks for client %p\n", clnt);
 
         /*
          * Spin lock all_tasks to prevent changes...
@@ -982,7 +985,8 @@ static void rpciod_killall(void)
                 rpc_killall_tasks(NULL);
                 flush_workqueue(rpciod_workqueue);
                 if (!list_empty(&all_tasks)) {
-                        dprintk("rpciod_killall: waiting for tasks to exit\n");
+                        dprintk("RPC:       rpciod_killall: waiting for tasks "
+                                        "to exit\n");
                         yield();
                 }
         }
@@ -1002,7 +1006,7 @@ rpciod_up(void)
         int error = 0;
 
         mutex_lock(&rpciod_mutex);
-        dprintk("rpciod_up: users %d\n", rpciod_users);
+        dprintk("RPC:       rpciod_up: users %u\n", rpciod_users);
         rpciod_users++;
         if (rpciod_workqueue)
                 goto out;
@@ -1010,7 +1014,7 @@ rpciod_up(void)
          * If there's no pid, we should be the first user.
          */
         if (rpciod_users > 1)
-                printk(KERN_WARNING "rpciod_up: no workqueue, %d users??\n", rpciod_users);
+                printk(KERN_WARNING "rpciod_up: no workqueue, %u users??\n", rpciod_users);
         /*
          * Create the rpciod thread and wait for it to start.
          */
@@ -1032,7 +1036,7 @@ void
 rpciod_down(void)
 {
         mutex_lock(&rpciod_mutex);
-        dprintk("rpciod_down sema %d\n", rpciod_users);
+        dprintk("RPC:       rpciod_down sema %u\n", rpciod_users);
         if (rpciod_users) {
                 if (--rpciod_users)
                         goto out;
@@ -1040,7 +1044,7 @@ rpciod_down(void)
                 printk(KERN_WARNING "rpciod_down: no users??\n");
 
         if (!rpciod_workqueue) {
-                dprintk("rpciod_down: Nothing to do!\n");
+                dprintk("RPC:       rpciod_down: Nothing to do!\n");
                 goto out;
         }
         rpciod_killall();
@@ -1070,7 +1074,7 @@ void rpc_show_tasks(void)
                 if (RPC_IS_QUEUED(t))
                         rpc_waitq = rpc_qname(t->u.tk_wait.rpc_waitq);
 
-                printk("%05d %04d %04x %06d %8p %6d %8p %08ld %8s %8p %8p\n",
+                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_flags, t->tk_status,
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index bd98124c3a6..d19cd9ec6e9 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -226,7 +226,7 @@ do_register(const char *name, void *data, const struct file_operations *fops)
         struct proc_dir_entry *ent;
 
         rpc_proc_init();
-        dprintk("RPC: registering /proc/net/rpc/%s\n", name);
+        dprintk("RPC:       registering /proc/net/rpc/%s\n", name);
 
         ent = create_proc_entry(name, 0, proc_net_rpc);
         if (ent) {
@@ -263,7 +263,7 @@ svc_proc_unregister(const char *name)
 void
 rpc_proc_init(void)
 {
-        dprintk("RPC: registering /proc/net/rpc\n");
+        dprintk("RPC:       registering /proc/net/rpc\n");
         if (!proc_net_rpc) {
                 struct proc_dir_entry *ent;
                 ent = proc_mkdir("rpc", proc_net);
@@ -277,7 +277,7 @@ rpc_proc_init(void)
 void
 rpc_proc_exit(void)
 {
-        dprintk("RPC: unregistering /proc/net/rpc\n");
+        dprintk("RPC:       unregistering /proc/net/rpc\n");
         if (proc_net_rpc) {
                 proc_net_rpc = NULL;
                 remove_proc_entry("net/rpc", NULL);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 4c161121111..b0fb6406d54 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -317,7 +317,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
         for (i = 0; i < serv->sv_nrpools; i++) {
                 struct svc_pool *pool = &serv->sv_pools[i];
 
-                dprintk("initialising pool %u for %s\n",
+                dprintk("svc: initialising pool %u for %s\n",
                                 i, serv->sv_name);
 
                 pool->sp_id = i;
@@ -368,7 +368,7 @@ svc_destroy(struct svc_serv *serv)
 {
         struct svc_sock *svsk;
 
-        dprintk("RPC: svc_destroy(%s, %d)\n",
+        dprintk("svc: svc_destroy(%s, %d)\n",
                                 serv->sv_program->pg_name,
                                 serv->sv_nrthreads);
 
@@ -654,7 +654,7 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port)
                         if (progp->pg_vers[i] == NULL)
                                 continue;
 
-                        dprintk("RPC: svc_register(%s, %s, %d, %d)%s\n",
+                        dprintk("svc: svc_register(%s, %s, %d, %d)%s\n",
                                         progp->pg_name,
                                         proto == IPPROTO_UDP?  "udp" : "tcp",
                                         port,
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 7a3999f0a4a..cf59f7d315d 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -108,7 +108,7 @@ int xprt_reserve_xprt(struct rpc_task *task)
         return 1;
 
 out_sleep:
-        dprintk("RPC: %4d failed to lock transport %p\n",
+        dprintk("RPC: %5u failed to lock transport %p\n",
                         task->tk_pid, xprt);
         task->tk_timeout = 0;
         task->tk_status = -EAGAIN;
@@ -158,7 +158,7 @@ int xprt_reserve_xprt_cong(struct rpc_task *task)
         }
         xprt_clear_locked(xprt);
 out_sleep:
-        dprintk("RPC: %4d failed to lock transport %p\n", task->tk_pid, xprt);
+        dprintk("RPC: %5u failed to lock transport %p\n", task->tk_pid, xprt);
         task->tk_timeout = 0;
         task->tk_status = -EAGAIN;
         if (req && req->rq_ntrans)
@@ -281,7 +281,7 @@ __xprt_get_cong(struct rpc_xprt *xprt, struct rpc_task *task)
 
         if (req->rq_cong)
                 return 1;
-        dprintk("RPC: %4d xprt_cwnd_limited cong = %ld cwnd = %ld\n",
+        dprintk("RPC: %5u xprt_cwnd_limited cong = %lu cwnd = %lu\n",
                         task->tk_pid, xprt->cong, xprt->cwnd);
         if (RPCXPRT_CONGESTED(xprt))
                 return 0;
@@ -340,7 +340,7 @@ void xprt_adjust_cwnd(struct rpc_task *task, int result)
                 if (cwnd < RPC_CWNDSCALE)
                         cwnd = RPC_CWNDSCALE;
         }
-        dprintk("RPC:      cong %ld, cwnd was %ld, now %ld\n",
+        dprintk("RPC:       cong %ld, cwnd was %ld, now %ld\n",
                         xprt->cong, xprt->cwnd, cwnd);
         xprt->cwnd = cwnd;
         __xprt_put_cong(xprt, req);
@@ -387,8 +387,8 @@ void xprt_write_space(struct rpc_xprt *xprt)
 
         spin_lock_bh(&xprt->transport_lock);
         if (xprt->snd_task) {
-                dprintk("RPC:      write space: waking waiting task on xprt %p\n",
-                                xprt);
+                dprintk("RPC:       write space: waking waiting task on "
+                                "xprt %p\n", xprt);
                 rpc_wake_up_task(xprt->snd_task);
         }
         spin_unlock_bh(&xprt->transport_lock);
@@ -494,7 +494,7 @@ static void xprt_autoclose(struct work_struct *work)
  */
 void xprt_disconnect(struct rpc_xprt *xprt)
 {
-        dprintk("RPC:      disconnected transport %p\n", xprt);
+        dprintk("RPC:       disconnected transport %p\n", xprt);
         spin_lock_bh(&xprt->transport_lock);
         xprt_clear_connected(xprt);
         xprt_wake_pending_tasks(xprt, -ENOTCONN);
@@ -530,7 +530,7 @@ void xprt_connect(struct rpc_task *task)
 {
         struct rpc_xprt *xprt = task->tk_xprt;
 
-        dprintk("RPC: %4d xprt_connect xprt %p %s connected\n", task->tk_pid,
+        dprintk("RPC: %5u xprt_connect xprt %p %s connected\n", task->tk_pid,
                         xprt, (xprt_connected(xprt) ? "is" : "is not"));
 
         if (!xprt_bound(xprt)) {
@@ -560,7 +560,7 @@ static void xprt_connect_status(struct rpc_task *task)
         if (task->tk_status >= 0) {
                 xprt->stat.connect_count++;
                 xprt->stat.connect_time += (long)jiffies - xprt->stat.connect_start;
-                dprintk("RPC: %4d xprt_connect_status: connection established\n",
+                dprintk("RPC: %5u xprt_connect_status: connection established\n",
                                 task->tk_pid);
                 return;
         }
@@ -568,20 +568,22 @@ static void xprt_connect_status(struct rpc_task *task)
         switch (task->tk_status) {
         case -ECONNREFUSED:
         case -ECONNRESET:
-                dprintk("RPC: %4d xprt_connect_status: server %s refused connection\n",
-                                task->tk_pid, task->tk_client->cl_server);
+                dprintk("RPC: %5u xprt_connect_status: server %s refused "
+                                "connection\n", task->tk_pid,
+                                task->tk_client->cl_server);
                 break;
         case -ENOTCONN:
-                dprintk("RPC: %4d xprt_connect_status: connection broken\n",
+                dprintk("RPC: %5u xprt_connect_status: connection broken\n",
                                 task->tk_pid);
                 break;
         case -ETIMEDOUT:
-                dprintk("RPC: %4d xprt_connect_status: connect attempt timed out\n",
-                                task->tk_pid);
+                dprintk("RPC: %5u xprt_connect_status: connect attempt timed "
+                                "out\n", task->tk_pid);
                 break;
         default:
-                dprintk("RPC: %4d xprt_connect_status: error %d connecting to server %s\n",
-                                task->tk_pid, -task->tk_status, task->tk_client->cl_server);
+                dprintk("RPC: %5u xprt_connect_status: error %d connecting to "
+                                "server %s\n", task->tk_pid, -task->tk_status,
+                                task->tk_client->cl_server);
                 xprt_release_write(xprt, task);
                 task->tk_status = -EIO;
         }
@@ -602,6 +604,9 @@ struct rpc_rqst *xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid)
                 if (entry->rq_xid == xid)
                         return entry;
         }
+
+        dprintk("RPC:       xprt_lookup_rqst did not find xid %08x\n",
+                        ntohl(xid));
         xprt->stat.bad_xids++;
         return NULL;
 }
@@ -654,7 +659,7 @@ static void xprt_timer(struct rpc_task *task)
         struct rpc_rqst *req = task->tk_rqstp;
         struct rpc_xprt *xprt = req->rq_xprt;
 
-        dprintk("RPC: %4d xprt_timer\n", task->tk_pid);
+        dprintk("RPC: %5u xprt_timer\n", task->tk_pid);
 
         spin_lock(&xprt->transport_lock);
         if (!req->rq_received) {
@@ -678,7 +683,7 @@ int xprt_prepare_transmit(struct rpc_task *task)
         struct rpc_xprt *xprt = req->rq_xprt;
         int err = 0;
 
-        dprintk("RPC: %4d xprt_prepare_transmit\n", task->tk_pid);
+        dprintk("RPC: %5u xprt_prepare_transmit\n", task->tk_pid);
 
         spin_lock_bh(&xprt->transport_lock);
         if (req->rq_received && !req->rq_bytes_sent) {
@@ -716,7 +721,7 @@ void xprt_transmit(struct rpc_task *task)
         struct rpc_xprt *xprt = req->rq_xprt;
         int status;
 
-        dprintk("RPC: %4d xprt_transmit(%u)\n", task->tk_pid, req->rq_slen);
+        dprintk("RPC: %5u xprt_transmit(%u)\n", task->tk_pid, req->rq_slen);
 
         if (!req->rq_received) {
                 if (list_empty(&req->rq_list)) {
@@ -736,7 +741,7 @@ void xprt_transmit(struct rpc_task *task)
 
         status = xprt->ops->send_request(task);
         if (status == 0) {
-                dprintk("RPC: %4d xmit complete\n", task->tk_pid);
+                dprintk("RPC: %5u xmit complete\n", task->tk_pid);
                 spin_lock_bh(&xprt->transport_lock);
 
                 xprt->ops->set_retrans_timeout(task);
@@ -777,7 +782,7 @@ static inline void do_xprt_reserve(struct rpc_task *task)
                 xprt_request_init(task, xprt);
                 return;
         }
-        dprintk("RPC:      waiting for request slot\n");
+        dprintk("RPC:       waiting for request slot\n");
         task->tk_status = -EAGAIN;
         task->tk_timeout = 0;
         rpc_sleep_on(&xprt->backlog, task, NULL, NULL);
@@ -822,7 +827,7 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
         req->rq_xid     = xprt_alloc_xid(xprt);
         req->rq_release_snd_buf = NULL;
         xprt_reset_majortimeo(req);
-        dprintk("RPC: %4d reserved req %p xid %08x\n", task->tk_pid,
+        dprintk("RPC: %5u reserved req %p xid %08x\n", task->tk_pid,
                         req, ntohl(req->rq_xid));
 }
 
@@ -856,7 +861,7 @@ void xprt_release(struct rpc_task *task)
                 req->rq_release_snd_buf(req);
         memset(req, 0, sizeof(*req));   /* mark unused */
 
-        dprintk("RPC: %4d release request %p\n", task->tk_pid, req);
+        dprintk("RPC: %5u release request %p\n", task->tk_pid, req);
 
         spin_lock(&xprt->reserve_lock);
         list_add(&req->rq_list, &xprt->free);
@@ -906,7 +911,7 @@ struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t si
                 return ERR_PTR(-EIO);
         }
         if (IS_ERR(xprt)) {
-                dprintk("RPC:      xprt_create_transport: failed, %ld\n",
+                dprintk("RPC:       xprt_create_transport: failed, %ld\n",
                                 -PTR_ERR(xprt));
                 return xprt;
         }
@@ -936,7 +941,7 @@ struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t si
 
         xprt_init_xid(xprt);
 
-        dprintk("RPC:      created transport %p with %u slots\n", xprt,
+        dprintk("RPC:       created transport %p with %u slots\n", xprt,
                         xprt->max_reqs);
 
         return xprt;
@@ -951,7 +956,7 @@ static void xprt_destroy(struct kref *kref)
 {
         struct rpc_xprt *xprt = container_of(kref, struct rpc_xprt, kref);
 
-        dprintk("RPC:      destroying transport %p\n", xprt);
+        dprintk("RPC:       destroying transport %p\n", xprt);
         xprt->shutdown = 1;
         del_timer_sync(&xprt->timer);
 
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 49cabffd7fd..64736b3a59a 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -192,7 +192,7 @@ static void xs_pktdump(char *msg, u32 *packet, unsigned int count)
         u8 *buf = (u8 *) packet;
         int j;
 
-        dprintk("RPC:      %s\n", msg);
+        dprintk("RPC:       %s\n", msg);
         for (j = 0; j < count && j < 128; j += 4) {
                 if (!(j & 31)) {
                         if (j)
@@ -418,7 +418,7 @@ static void xs_nospace(struct rpc_task *task)
         struct rpc_xprt *xprt = req->rq_xprt;
         struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
 
-        dprintk("RPC: %4d xmit incomplete (%u left of %u)\n",
+        dprintk("RPC: %5u xmit incomplete (%u left of %u)\n",
                         task->tk_pid, req->rq_slen - req->rq_bytes_sent,
                         req->rq_slen);
 
@@ -467,7 +467,7 @@ static int xs_udp_send_request(struct rpc_task *task)
                               xprt->addrlen, xdr,
                               req->rq_bytes_sent);
 
-        dprintk("RPC:      xs_udp_send_request(%u) = %d\n",
+        dprintk("RPC:       xs_udp_send_request(%u) = %d\n",
                         xdr->len - req->rq_bytes_sent, status);
 
         if (likely(status >= (int) req->rq_slen))
@@ -488,7 +488,7 @@ static int xs_udp_send_request(struct rpc_task *task)
                 xs_nospace(task);
                 break;
         default:
-                dprintk("RPC:      sendmsg returned unrecognized error %d\n",
+                dprintk("RPC:       sendmsg returned unrecognized error %d\n",
                         -status);
                 break;
         }
@@ -539,7 +539,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
                 status = xs_sendpages(transport->sock,
                                         NULL, 0, xdr, req->rq_bytes_sent);
 
-                dprintk("RPC:      xs_tcp_send_request(%u) = %d\n",
+                dprintk("RPC:       xs_tcp_send_request(%u) = %d\n",
                                 xdr->len - req->rq_bytes_sent, status);
 
                 if (unlikely(status < 0))
@@ -570,7 +570,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
                 status = -ENOTCONN;
                 break;
         default:
-                dprintk("RPC:      sendmsg returned unrecognized error %d\n",
+                dprintk("RPC:       sendmsg returned unrecognized error %d\n",
                         -status);
                 xprt_disconnect(xprt);
                 break;
@@ -622,7 +622,7 @@ static void xs_close(struct rpc_xprt *xprt)
         if (!sk)
                 goto clear_close_wait;
 
-        dprintk("RPC:      xs_close xprt %p\n", xprt);
+        dprintk("RPC:       xs_close xprt %p\n", xprt);
 
         write_lock_bh(&sk->sk_callback_lock);
         transport->inet = NULL;
@@ -652,7 +652,7 @@ static void xs_destroy(struct rpc_xprt *xprt)
 {
         struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
 
-        dprintk("RPC:      xs_destroy xprt %p\n", xprt);
+        dprintk("RPC:       xs_destroy xprt %p\n", xprt);
 
         cancel_delayed_work(&transport->connect_worker);
         flush_scheduled_work();
@@ -686,7 +686,7 @@ static void xs_udp_data_ready(struct sock *sk, int len)
         __be32 *xp;
 
         read_lock(&sk->sk_callback_lock);
-        dprintk("RPC:      xs_udp_data_ready...\n");
+        dprintk("RPC:       xs_udp_data_ready...\n");
         if (!(xprt = xprt_from_sock(sk)))
                 goto out;
 
@@ -698,7 +698,7 @@ static void xs_udp_data_ready(struct sock *sk, int len)
 
         repsize = skb->len - sizeof(struct udphdr);
         if (repsize < 4) {
-                dprintk("RPC:      impossible RPC reply size %d!\n", repsize);
+                dprintk("RPC:       impossible RPC reply size %d!\n", repsize);
                 goto dropit;
         }
 
@@ -762,11 +762,11 @@ static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, struct xdr_skb_rea
 
         /* Sanity check of the record length */
         if (unlikely(transport->tcp_reclen < 4)) {
-                dprintk("RPC:      invalid TCP record fragment length\n");
+                dprintk("RPC:       invalid TCP record fragment length\n");
                 xprt_disconnect(xprt);
                 return;
         }
-        dprintk("RPC:      reading TCP record fragment of length %d\n",
+        dprintk("RPC:       reading TCP record fragment of length %d\n",
                         transport->tcp_reclen);
 }
 
@@ -789,7 +789,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
         char *p;
 
         len = sizeof(transport->tcp_xid) - transport->tcp_offset;
-        dprintk("RPC:      reading XID (%Zu bytes)\n", len);
+        dprintk("RPC:       reading XID (%Zu bytes)\n", len);
         p = ((char *) &transport->tcp_xid) + transport->tcp_offset;
         used = xdr_skb_read_bits(desc, p, len);
         transport->tcp_offset += used;
@@ -798,7 +798,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
         transport->tcp_flags &= ~TCP_RCV_COPY_XID;
         transport->tcp_flags |= TCP_RCV_COPY_DATA;
         transport->tcp_copied = 4;
-        dprintk("RPC:      reading reply for XID %08x\n",
+        dprintk("RPC:       reading reply for XID %08x\n",
                         ntohl(transport->tcp_xid));
         xs_tcp_check_fraghdr(transport);
 }
@@ -816,7 +816,7 @@ static inline void xs_tcp_read_request(struct rpc_xprt *xprt, struct xdr_skb_rea
         req = xprt_lookup_rqst(xprt, transport->tcp_xid);
         if (!req) {
                 transport->tcp_flags &= ~TCP_RCV_COPY_DATA;
-                dprintk("RPC:      XID %08x request not found!\n",
+                dprintk("RPC:       XID %08x request not found!\n",
                                 ntohl(transport->tcp_xid));
                 spin_unlock(&xprt->transport_lock);
                 return;
@@ -853,19 +853,20 @@ static inline void xs_tcp_read_request(struct rpc_xprt *xprt, struct xdr_skb_rea
                  * be discarded.
                  */
                 transport->tcp_flags &= ~TCP_RCV_COPY_DATA;
-                dprintk("RPC:      XID %08x truncated request\n",
+                dprintk("RPC:       XID %08x truncated request\n",
                                 ntohl(transport->tcp_xid));
-                dprintk("RPC:      xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u\n",
-                                xprt, transport->tcp_copied, transport->tcp_offset,
-                                        transport->tcp_reclen);
+                dprintk("RPC:       xprt = %p, tcp_copied = %lu, "
+                                "tcp_offset = %u, tcp_reclen = %u\n",
+                                xprt, transport->tcp_copied,
+                                transport->tcp_offset, transport->tcp_reclen);
                 goto out;
         }
 
-        dprintk("RPC:      XID %08x read %Zd bytes\n",
+        dprintk("RPC:       XID %08x read %Zd bytes\n",
                         ntohl(transport->tcp_xid), r);
-        dprintk("RPC:      xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u\n",
-                        xprt, transport->tcp_copied, transport->tcp_offset,
-                                transport->tcp_reclen);
+        dprintk("RPC:       xprt = %p, tcp_copied = %lu, tcp_offset = %u, "
+                        "tcp_reclen = %u\n", xprt, transport->tcp_copied,
+                        transport->tcp_offset, transport->tcp_reclen);
 
         if (transport->tcp_copied == req->rq_private_buf.buflen)
                 transport->tcp_flags &= ~TCP_RCV_COPY_DATA;
@@ -891,7 +892,7 @@ static inline void xs_tcp_read_discard(struct sock_xprt *transport, struct xdr_s
         desc->count -= len;
         desc->offset += len;
         transport->tcp_offset += len;
-        dprintk("RPC:      discarded %Zu bytes\n", len);
+        dprintk("RPC:       discarded %Zu bytes\n", len);
         xs_tcp_check_fraghdr(transport);
 }
 
@@ -905,7 +906,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
                 .count  = len,
         };
 
-        dprintk("RPC:      xs_tcp_data_recv started\n");
+        dprintk("RPC:       xs_tcp_data_recv started\n");
         do {
                 /* Read in a new fragment marker if necessary */
                 /* Can we ever really expect to get completely empty fragments? */
@@ -926,7 +927,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
                 /* Skip over any trailing bytes on short reads */
                 xs_tcp_read_discard(transport, &desc);
         } while (desc.count);
-        dprintk("RPC:      xs_tcp_data_recv done\n");
+        dprintk("RPC:       xs_tcp_data_recv done\n");
         return len - desc.count;
 }
 
@@ -941,8 +942,9 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes)
         struct rpc_xprt *xprt;
         read_descriptor_t rd_desc;
 
+        dprintk("RPC:       xs_tcp_data_ready...\n");
+
         read_lock(&sk->sk_callback_lock);
-        dprintk("RPC:      xs_tcp_data_ready...\n");
         if (!(xprt = xprt_from_sock(sk)))
                 goto out;
         if (xprt->shutdown)
@@ -968,11 +970,11 @@ static void xs_tcp_state_change(struct sock *sk)
         read_lock(&sk->sk_callback_lock);
         if (!(xprt = xprt_from_sock(sk)))
                 goto out;
-        dprintk("RPC:      xs_tcp_state_change client %p...\n", xprt);
-        dprintk("RPC:      state %x conn %d dead %d zapped %d\n",
-                                sk->sk_state, xprt_connected(xprt),
-                                sock_flag(sk, SOCK_DEAD),
-                                sock_flag(sk, SOCK_ZAPPED));
+        dprintk("RPC:       xs_tcp_state_change client %p...\n", xprt);
+        dprintk("RPC:       state %x conn %d dead %d zapped %d\n",
+                        sk->sk_state, xprt_connected(xprt),
+                        sock_flag(sk, SOCK_DEAD),
+                        sock_flag(sk, SOCK_ZAPPED));
 
         switch (sk->sk_state) {
         case TCP_ESTABLISHED:
@@ -1140,7 +1142,7 @@ static void xs_set_port(struct rpc_xprt *xprt, unsigned short port)
 {
         struct sockaddr_in *sap = (struct sockaddr_in *) &xprt->addr;
 
-        dprintk("RPC:      setting port for xprt %p to %u\n", xprt, port);
+        dprintk("RPC:       setting port for xprt %p to %u\n", xprt, port);
 
         sap->sin_port = htons(port);
 }
@@ -1159,7 +1161,7 @@ static int xs_bindresvport(struct sock_xprt *transport, struct socket *sock)
                                                 sizeof(myaddr));
                 if (err == 0) {
                         transport->port = port;
-                        dprintk("RPC:      xs_bindresvport bound to port %u\n",
+                        dprintk("RPC:       xs_bindresvport bound to port %u\n",
                                         port);
                         return 0;
                 }
@@ -1169,7 +1171,7 @@ static int xs_bindresvport(struct sock_xprt *transport, struct socket *sock)
                         port--;
         } while (err == -EADDRINUSE && port != transport->port);
 
-        dprintk("RPC:      can't bind to reserved port (%d).\n", -err);
+        dprintk("RPC:       can't bind to reserved port (%d).\n", -err);
         return err;
 }
 
@@ -1223,7 +1225,7 @@ static void xs_udp_connect_worker(struct work_struct *work)
         xs_close(xprt);
 
         if ((err = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock)) < 0) {
-                dprintk("RPC:      can't create UDP transport socket (%d).\n", -err);
+                dprintk("RPC:       can't create UDP transport socket (%d).\n", -err);
                 goto out;
         }
         xs_reclassify_socket(sock);
@@ -1233,7 +1235,7 @@ static void xs_udp_connect_worker(struct work_struct *work)
                 goto out;
         }
 
-        dprintk("RPC:      worker connecting xprt %p to address: %s\n",
+        dprintk("RPC:       worker connecting xprt %p to address: %s\n",
                         xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
 
         if (!transport->inet) {
@@ -1275,7 +1277,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt)
         struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
         struct sockaddr any;
 
-        dprintk("RPC:      disconnecting xprt %p to reuse port\n", xprt);
+        dprintk("RPC:       disconnecting xprt %p to reuse port\n", xprt);
 
         /*
          * Disconnect the transport socket by doing a connect operation
@@ -1285,7 +1287,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt)
         any.sa_family = AF_UNSPEC;
         result = kernel_connect(transport->sock, &any, sizeof(any), 0);
         if (result)
-                dprintk("RPC:      AF_UNSPEC connect return code %d\n",
+                dprintk("RPC:       AF_UNSPEC connect return code %d\n",
                                 result);
 }
 
@@ -1309,7 +1311,8 @@ static void xs_tcp_connect_worker(struct work_struct *work)
         if (!sock) {
                 /* start from scratch */
                 if ((err = sock_create_kern(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock)) < 0) {
-                        dprintk("RPC:      can't create TCP transport socket (%d).\n", -err);
+                        dprintk("RPC:       can't create TCP transport "
+                                        "socket (%d).\n", -err);
                         goto out;
                 }
                 xs_reclassify_socket(sock);
@@ -1322,7 +1325,7 @@ static void xs_tcp_connect_worker(struct work_struct *work)
                 /* "close" the socket, preserving the local port */
                 xs_tcp_reuse_connection(xprt);
 
-        dprintk("RPC:      worker connecting xprt %p to address: %s\n",
+        dprintk("RPC:       worker connecting xprt %p to address: %s\n",
                         xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
 
         if (!transport->inet) {
@@ -1359,8 +1362,9 @@ static void xs_tcp_connect_worker(struct work_struct *work)
         xprt->stat.connect_start = jiffies;
         status = kernel_connect(sock, (struct sockaddr *) &xprt->addr,
                         xprt->addrlen, O_NONBLOCK);
-        dprintk("RPC: %p  connect status %d connected %d sock state %d\n",
-                        xprt, -status, xprt_connected(xprt), sock->sk->sk_state);
+        dprintk("RPC:       %p connect status %d connected %d sock state %d\n",
+                        xprt, -status, xprt_connected(xprt),
+                        sock->sk->sk_state);
         if (status < 0) {
                 switch (status) {
                         case -EINPROGRESS:
@@ -1404,7 +1408,8 @@ static void xs_connect(struct rpc_task *task)
                 return;
 
         if (transport->sock != NULL) {
-                dprintk("RPC:      xs_connect delayed xprt %p for %lu seconds\n",
+                dprintk("RPC:       xs_connect delayed xprt %p for %lu "
+                                "seconds\n",
                                 xprt, xprt->reestablish_timeout / HZ);
                 schedule_delayed_work(&transport->connect_worker,
                                         xprt->reestablish_timeout);
@@ -1412,7 +1417,7 @@ static void xs_connect(struct rpc_task *task)
                 if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
                         xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
         } else {
-                dprintk("RPC:      xs_connect scheduled xprt %p\n", xprt);
+                dprintk("RPC:       xs_connect scheduled xprt %p\n", xprt);
                 schedule_delayed_work(&transport->connect_worker, 0);
 
                 /* flush_scheduled_work can sleep... */
@@ -1507,13 +1512,14 @@ static struct rpc_xprt *xs_setup_xprt(struct sockaddr *addr, size_t addrlen, uns
         struct sock_xprt *new;
 
         if (addrlen > sizeof(xprt->addr)) {
-                dprintk("RPC:      xs_setup_xprt: address too large\n");
+                dprintk("RPC:       xs_setup_xprt: address too large\n");
                 return ERR_PTR(-EBADF);
         }
 
         new = kzalloc(sizeof(*new), GFP_KERNEL);
         if (new == NULL) {
-                dprintk("RPC:      xs_setup_xprt: couldn't allocate rpc_xprt\n");
+                dprintk("RPC:       xs_setup_xprt: couldn't allocate "
+                                "rpc_xprt\n");
                 return ERR_PTR(-ENOMEM);
         }
         xprt = &new->xprt;
@@ -1522,7 +1528,8 @@ static struct rpc_xprt *xs_setup_xprt(struct sockaddr *addr, size_t addrlen, uns
         xprt->slot = kcalloc(xprt->max_reqs, sizeof(struct rpc_rqst), GFP_KERNEL);
         if (xprt->slot == NULL) {
                 kfree(xprt);
-                dprintk("RPC:      xs_setup_xprt: couldn't allocate slot table\n");
+                dprintk("RPC:       xs_setup_xprt: couldn't allocate slot "
+                                "table\n");
                 return ERR_PTR(-ENOMEM);
         }
 
@@ -1572,7 +1579,7 @@ struct rpc_xprt *xs_setup_udp(struct sockaddr *addr, size_t addrlen, struct rpc_
                 xprt_set_timeout(&xprt->timeout, 5, 5 * HZ);
 
         xs_format_peer_addresses(xprt);
-        dprintk("RPC:      set up transport to address %s\n",
+        dprintk("RPC:       set up transport to address %s\n",
                         xprt->address_strings[RPC_DISPLAY_ALL]);
 
         return xprt;
@@ -1616,7 +1623,7 @@ struct rpc_xprt *xs_setup_tcp(struct sockaddr *addr, size_t addrlen, struct rpc_
                 xprt_set_timeout(&xprt->timeout, 2, 60 * HZ);
 
         xs_format_peer_addresses(xprt);
-        dprintk("RPC:      set up transport to address %s\n",
+        dprintk("RPC:       set up transport to address %s\n",
                         xprt->address_strings[RPC_DISPLAY_ALL]);
 
         return xprt;