From 5f7c0066ee6b1f42acd058adef77379651242406 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Tue, 5 Dec 2006 16:36:14 -0500 Subject: [PATCH] --- yaml --- r: 42555 b: refs/heads/master c: 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba h: refs/heads/master i: 42553: 06d60d6e1968407769bc051c9af3a60085c314f9 42551: 28d78268ffb978683021cbc573d70c3f13ed01f6 v: v3 --- [refs] | 2 +- trunk/include/linux/sunrpc/debug.h | 6 ------ trunk/net/sunrpc/xprt.c | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 9f69832d18df..8fd7b2893bef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c041b5ff8d50c432698d9bfbd68cc4b76c2ea5bc +refs/heads/master: 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba diff --git a/trunk/include/linux/sunrpc/debug.h b/trunk/include/linux/sunrpc/debug.h index e4729aa67654..60fce3c92857 100644 --- a/trunk/include/linux/sunrpc/debug.h +++ b/trunk/include/linux/sunrpc/debug.h @@ -62,12 +62,6 @@ extern unsigned int nlm_debug; # define RPC_IFDEBUG(x) #endif -#ifdef RPC_PROFILE -# define pprintk(args...) printk(## args) -#else -# define pprintk(args...) do ; while (0) -#endif - /* * Sysctl interface for RPC debugging */ diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c index 8cc2afa2942c..f8ca0a93454c 100644 --- a/trunk/net/sunrpc/xprt.c +++ b/trunk/net/sunrpc/xprt.c @@ -459,7 +459,6 @@ int xprt_adjust_timeout(struct rpc_rqst *req) if (to->to_maxval && req->rq_timeout >= to->to_maxval) req->rq_timeout = to->to_maxval; req->rq_retries++; - pprintk("RPC: %lu retrans\n", jiffies); } else { req->rq_timeout = to->to_initval; req->rq_retries = 0; @@ -468,7 +467,6 @@ int xprt_adjust_timeout(struct rpc_rqst *req) spin_lock_bh(&xprt->transport_lock); rpc_init_rtt(req->rq_task->tk_client->cl_rtt, to->to_initval); spin_unlock_bh(&xprt->transport_lock); - pprintk("RPC: %lu timeout\n", jiffies); status = -ETIMEDOUT; }