diff --git a/[refs] b/[refs]
index 24c4c1d9cc65..e8cb95a17a9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d509e5454a0a5ac88bf3191ab65d85952c1de31
+refs/heads/master: cab6fc1b77c3ec4471d7d54ff6db9ad2dd59c2f5
diff --git a/trunk/fs/lockd/xdr.c b/trunk/fs/lockd/xdr.c
index 633653bff944..3e459e18cc31 100644
--- a/trunk/fs/lockd/xdr.c
+++ b/trunk/fs/lockd/xdr.c
@@ -612,8 +612,7 @@ const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)
 	 * called with BKL held.
 	 */
 	static char buf[2*NLM_MAXCOOKIELEN+1];
-	int i;
-	int len = sizeof(buf);
+	unsigned int i, len = sizeof(buf);
 	char *p = buf;
 
 	len--;	/* allow for trailing \0 */