From 07fac9efdc8883a20d33cd4d0264cd282b681821 Mon Sep 17 00:00:00 2001
From: Frank Filz <ffilzlnx@us.ibm.com>
Date: Thu, 2 Dec 2010 19:31:23 +0000
Subject: [PATCH] --- yaml --- r: 234115 b: refs/heads/master c:
 3fa0b4e201d254b52a251fa348bd53e53000cff6 h: refs/heads/master i:   234113:
 37e3d1c0522cdfa233c12010a96fa6f414fb9c51   234111:
 eb2d3ab73b8872e530eca99c088e1e40b610f023 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/inode.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3bf837858d2..636ddd583fae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b7c3f051dea504afccc39bcb56d8e26c2e0b77
+refs/heads/master: 3fa0b4e201d254b52a251fa348bd53e53000cff6
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 1cc600e77bb4..2f8e61816d75 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -37,6 +37,7 @@
 #include <linux/inet.h>
 #include <linux/nfs_xdr.h>
 #include <linux/slab.h>
+#include <linux/compat.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -89,7 +90,11 @@ int nfs_wait_bit_killable(void *word)
  */
 u64 nfs_compat_user_ino64(u64 fileid)
 {
-	int ino;
+#ifdef CONFIG_COMPAT
+	compat_ulong_t ino;
+#else	
+	unsigned long ino;
+#endif
 
 	if (enable_ino64)
 		return fileid;