From 140699ecf9270a020614be1a18c4091f617f8f0d Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Mon, 10 Dec 2012 18:15:07 -0500
Subject: [PATCH] --- yaml --- r: 347728 b: refs/heads/master c:
 3a28e331115be5130fe061e6b4183b29385116a6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 78acbc60dfda..d6d68d1bd270 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18d9a2ca2ea1aa963a077fb49e7efcc3b0237a9b
+refs/heads/master: 3a28e331115be5130fe061e6b4183b29385116a6
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index 38ec968ca1c6..d8e5adfeac30 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -952,8 +952,8 @@ static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)
 		dprintk("svc: TCP record, %d bytes\n", svc_sock_reclen(svsk));
 		if (svc_sock_reclen(svsk) + svsk->sk_datalen >
 							serv->sv_max_mesg) {
-			net_notice_ratelimited("RPC: fragment too large: 0x%08lx\n",
-					       (unsigned long)svsk->sk_reclen);
+			net_notice_ratelimited("RPC: fragment too large: %d\n",
+					svc_sock_reclen(svsk));
 			goto err_delete;
 		}
 	}
@@ -1080,8 +1080,8 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
 		if (len == want)
 			svc_tcp_fragment_received(svsk);
 		else
-			dprintk("svc: incomplete TCP record (%ld of %d)\n",
-				svsk->sk_tcplen - sizeof(rpc_fraghdr),
+			dprintk("svc: incomplete TCP record (%d of %d)\n",
+				(int)(svsk->sk_tcplen - sizeof(rpc_fraghdr)),
 				svc_sock_reclen(svsk));
 		goto err_noclose;
 	}