[PATCH] net/sunrpc/clnt.c compile fix

[Paul Mundt]

Not sure if anyone has submitted this already, but as the subject implies,
net/sunrpc/clnt.c does not compile in either stock test7 or in current BK:

  CC      net/sunrpc/clnt.o
  net/sunrpc/clnt.c: In function `call_verify':
  net/sunrpc/clnt.c:965: structure has no member named `tk_pid'
  net/sunrpc/clnt.c:970: structure has no member named `tk_pid'
  net/sunrpc/clnt.c:976: structure has no member named `tk_pid'
  make[1]: *** [net/sunrpc/clnt.o] Error 1
  make: *** [net/sunrpc/clnt.o] Error 2

This is due to the fact that tk_pid is protected by RPC_DEBUG. Wrapping
through dprintk() fixes this.

--- linux-sh-2.6.0-test7.orig/net/sunrpc/clnt.c	Thu Oct  9 09:42:45 2003
+++ linux-sh-2.6.0-test7/net/sunrpc/clnt.c	Thu Oct  9 12:04:56 2003
@@ -961,18 +961,18 @@
 	case RPC_SUCCESS:
 		return p;
 	case RPC_PROG_UNAVAIL:
-		printk(KERN_WARNING "RPC: %4d call_verify: program %u is unsupported by server %s\n",
+		dprintk("RPC: %4d call_verify: program %u is unsupported by server %s\n",
 				task->tk_pid, (unsigned int)task->tk_client->cl_prog,
 				task->tk_client->cl_server);
 		goto out_eio;
 	case RPC_PROG_MISMATCH:
-		printk(KERN_WARNING "RPC: %4d call_verify: program %u, version %u unsupported by server %s\n",
+		dprintk("RPC: %4d call_verify: program %u, version %u unsupported by server %s\n",
 				task->tk_pid, (unsigned int)task->tk_client->cl_prog,
 				(unsigned int)task->tk_client->cl_vers,
 				task->tk_client->cl_server);
 		goto out_eio;
 	case RPC_PROC_UNAVAIL:
-		printk(KERN_WARNING "RPC: %4d call_verify: proc %p unsupported by program %u, version %u on server %s\n",
+		dprintk("RPC: %4d call_verify: proc %p unsupported by program %u, version %u on server %s\n",
 				task->tk_pid, task->tk_msg.rpc_proc,
 				task->tk_client->cl_prog,
 				task->tk_client->cl_vers,

Attachment: pgp00001.pgp
Description: PGP signature