summaryrefslogtreecommitdiffstats
path: root/fs/lockd/xdr.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /fs/lockd/xdr.c
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/lockd/xdr.c')
-rw-r--r--fs/lockd/xdr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 85fb7c729..cb090cfd3 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -95,8 +95,8 @@ nlm_decode_fh(u32 *p, struct nfs_fh *f)
if ((len = ntohl(*p++)) != sizeof(*f)) {
printk(KERN_NOTICE
- "lockd: bad fhandle size %x (should be %d)\n",
- len, sizeof(*f));
+ "lockd: bad fhandle size %u (should be %lu)\n",
+ len, (unsigned long) sizeof(*f));
return NULL;
}
memcpy(f, p, sizeof(*f));