patch-2.1.36 linux/fs/lockd/host.c

• Lines: 31
• Date: Tue Apr 15 21:47:24 1997
• Orig file: v2.1.35/linux/fs/lockd/host.c
• Orig date: Mon Apr 7 11:35:30 1997

diff -u --recursive --new-file v2.1.35/linux/fs/lockd/host.c linux/fs/lockd/host.c
@@ -21,7 +21,7 @@
 #define NLM_HOST_MAX		64
 #define NLM_HOST_NRHASH		32
 #define NLM_ADDRHASH(addr)	(ntohl(addr) & (NLM_HOST_NRHASH-1))
-#define NLM_PTRHASH(ptr)	((((u32) ptr) / 32) & (NLM_HOST_NRHASH-1))
+#define NLM_PTRHASH(ptr)	((((u32)(unsigned long) ptr) / 32) & (NLM_HOST_NRHASH-1))
 #define NLM_HOST_REBIND		(60 * HZ)
 #define NLM_HOST_EXPIRE		((nrhosts > NLM_HOST_MAX)? 300 * HZ : 120 * HZ)
 #define NLM_HOST_COLLECT	((nrhosts > NLM_HOST_MAX)? 120 * HZ :  60 * HZ)
@@ -81,8 +81,8 @@
 		return NULL;
 	}
 
-	dprintk("lockd: nlm_lookup_host(%08lx, p=%d, v=%d)\n",
-			sin? ntohl(sin->sin_addr.s_addr) : 0, proto, version);
+	dprintk("lockd: nlm_lookup_host(%08x, p=%d, v=%d)\n",
+			(unsigned)(sin? ntohl(sin->sin_addr.s_addr) : 0), proto, version);
 
 	if (clnt)
 		hash = NLM_PTRHASH(clnt);
@@ -164,8 +164,8 @@
 	struct rpc_clnt	*clnt;
 	struct rpc_xprt	*xprt;
 
-	dprintk("lockd: nlm_bind_host(%08lx)\n",
-			ntohl(host->h_addr.sin_addr.s_addr));
+	dprintk("lockd: nlm_bind_host(%08x)\n",
+			(unsigned)ntohl(host->h_addr.sin_addr.s_addr));
 
 	/* Lock host handle */
 	down(&host->h_sema);