aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-09-25 11:57:05 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-09-29 18:13:40 -0400
commitdb820d6376aa81accf5b648651e160fd76e363e2 (patch)
treeb9447d4316b7319dd9675b9e93b4fdcc07d209a2 /net
parentf6fb3f6f591b50fa4f51962ad06ee0d8782e1bc8 (diff)
SUNRPC: Clean up debug messages in rpcb_clnt.c
The RPCB XDR functions are used for multiple procedures. For instance, rpcb_encode_getaddr() is used for RPCB_GETADDR, RPCB_SET, and RPCB_UNSET. Make the XDR debug messages more generic so they are less confusing. And, unlike in other RPC consumers in the kernel, a single debug flag enables all levels of debug messages in the RPC bind client, including XDR debug messages. Since the XDR decoders already report success or failure in this case, remove redundant debug messages in the mid-level rpcb_register_call() function. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/rpcb_clnt.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 0fa1086cf991..34abc91058d8 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -197,12 +197,8 @@ static int rpcb_register_call(struct sockaddr *addr, size_t addrlen,
197 return error; 197 return error;
198 } 198 }
199 199
200 if (!result) { 200 if (!result)
201 dprintk("RPC: registration failed\n");
202 return -EACCES; 201 return -EACCES;
203 }
204
205 dprintk("RPC: registration succeeded\n");
206 return 0; 202 return 0;
207} 203}
208 204
@@ -628,7 +624,7 @@ static void rpcb_getport_done(struct rpc_task *child, void *data)
628static int rpcb_encode_mapping(struct rpc_rqst *req, __be32 *p, 624static int rpcb_encode_mapping(struct rpc_rqst *req, __be32 *p,
629 struct rpcbind_args *rpcb) 625 struct rpcbind_args *rpcb)
630{ 626{
631 dprintk("RPC: rpcb_encode_mapping(%u, %u, %d, %u)\n", 627 dprintk("RPC: encoding rpcb request (%u, %u, %d, %u)\n",
632 rpcb->r_prog, rpcb->r_vers, rpcb->r_prot, rpcb->r_port); 628 rpcb->r_prog, rpcb->r_vers, rpcb->r_prot, rpcb->r_port);
633 *p++ = htonl(rpcb->r_prog); 629 *p++ = htonl(rpcb->r_prog);
634 *p++ = htonl(rpcb->r_vers); 630 *p++ = htonl(rpcb->r_vers);
@@ -643,7 +639,7 @@ static int rpcb_decode_getport(struct rpc_rqst *req, __be32 *p,
643 unsigned short *portp) 639 unsigned short *portp)
644{ 640{
645 *portp = (unsigned short) ntohl(*p++); 641 *portp = (unsigned short) ntohl(*p++);
646 dprintk("RPC: rpcb_decode_getport result %u\n", 642 dprintk("RPC: rpcb getport result: %u\n",
647 *portp); 643 *portp);
648 return 0; 644 return 0;
649} 645}
@@ -652,7 +648,7 @@ static int rpcb_decode_set(struct rpc_rqst *req, __be32 *p,
652 unsigned int *boolp) 648 unsigned int *boolp)
653{ 649{
654 *boolp = (unsigned int) ntohl(*p++); 650 *boolp = (unsigned int) ntohl(*p++);
655 dprintk("RPC: rpcb_decode_set: call %s\n", 651 dprintk("RPC: rpcb set/unset call %s\n",
656 (*boolp ? "succeeded" : "failed")); 652 (*boolp ? "succeeded" : "failed"));
657 return 0; 653 return 0;
658} 654}
@@ -660,7 +656,7 @@ static int rpcb_decode_set(struct rpc_rqst *req, __be32 *p,
660static int rpcb_encode_getaddr(struct rpc_rqst *req, __be32 *p, 656static int rpcb_encode_getaddr(struct rpc_rqst *req, __be32 *p,
661 struct rpcbind_args *rpcb) 657 struct rpcbind_args *rpcb)
662{ 658{
663 dprintk("RPC: rpcb_encode_getaddr(%u, %u, %s)\n", 659 dprintk("RPC: encoding rpcb request (%u, %u, %s)\n",
664 rpcb->r_prog, rpcb->r_vers, rpcb->r_addr); 660 rpcb->r_prog, rpcb->r_vers, rpcb->r_addr);
665 *p++ = htonl(rpcb->r_prog); 661 *p++ = htonl(rpcb->r_prog);
666 *p++ = htonl(rpcb->r_vers); 662 *p++ = htonl(rpcb->r_vers);