3 files changed, 13 insertions, 10 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index e4a04d16b8b0..dd02db43cbe6 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -407,7 +407,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
         struct file     *file = desc->file;
         struct nfs_entry *entry = desc->entry;
         struct dentry   *dentry = NULL;
-        unsigned long   fileid;
+        u64             fileid;
         int             loop_count = 0,
                         res;
 
@@ -418,7 +418,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
                 unsigned d_type = DT_UNKNOWN;
                 /* Note: entry->prev_cookie contains the cookie for
                  *       retrieving the current dirent on the server */
-                fileid = nfs_fileid_to_ino_t(entry->ino);
+                fileid = entry->ino;
 
                 /* Get a dentry if we have one */
                 if (dentry != NULL)
@@ -428,7 +428,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
                 /* Use readdirplus info */
                 if (dentry != NULL && dentry->d_inode != NULL) {
                         d_type = dt_type(dentry->d_inode);
-                        fileid = dentry->d_inode->i_ino;
+                        fileid = NFS_FILEID(dentry->d_inode);
                 }
 
                 res = filldir(dirent, entry->name, entry->len, 
@@ -1350,9 +1350,9 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
 static int nfs_sillyrename(struct inode *dir, struct dentry *dentry)
 {
         static unsigned int sillycounter;
-        const int      i_inosize  = sizeof(dir->i_ino)*2;
+        const int      fileidsize  = sizeof(NFS_FILEID(dentry->d_inode))*2;
         const int      countersize = sizeof(sillycounter)*2;
-        const int      slen       = sizeof(".nfs") + i_inosize + countersize - 1;
+        const int      slen        = sizeof(".nfs")+fileidsize+countersize-1;
         char           silly[slen+1];
         struct qstr    qsilly;
         struct dentry *sdentry;
@@ -1370,8 +1370,9 @@ static int nfs_sillyrename(struct inode *dir, struct dentry *dentry)
         if (dentry->d_flags & DCACHE_NFSFS_RENAMED)
                 goto out;
 
-        sprintf(silly, ".nfs%*.*lx",
-                i_inosize, i_inosize, dentry->d_inode->i_ino);
+        sprintf(silly, ".nfs%*.*Lx",
+                fileidsize, fileidsize,
+                (unsigned long long)NFS_FILEID(dentry->d_inode));
 
         /* Return delegation in anticipation of the rename */
         nfs_inode_return_delegation(dentry->d_inode);
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 119fefef13f3..3ad938cecd73 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -450,8 +450,10 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
                 err = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
         else
                 err = nfs_revalidate_inode(NFS_SERVER(inode), inode);
-        if (!err)
+        if (!err) {
                 generic_fillattr(inode, stat);
+                stat->ino = NFS_FILEID(inode);
+        }
         return err;
 }
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4b90e17555a9..d856e9f5913b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -177,7 +177,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
                 *p++ = xdr_one;                         /* bitmap length */
                 *p++ = htonl(FATTR4_WORD0_FILEID);             /* bitmap */
                 *p++ = htonl(8);              /* attribute buffer length */
-                p = xdr_encode_hyper(p, dentry->d_inode->i_ino);
+                p = xdr_encode_hyper(p, NFS_FILEID(dentry->d_inode));
         }
         
         *p++ = xdr_one;                                  /* next */
@@ -189,7 +189,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
         *p++ = xdr_one;                         /* bitmap length */
         *p++ = htonl(FATTR4_WORD0_FILEID);             /* bitmap */
         *p++ = htonl(8);              /* attribute buffer length */
-        p = xdr_encode_hyper(p, dentry->d_parent->d_inode->i_ino);
+        p = xdr_encode_hyper(p, NFS_FILEID(dentry->d_parent->d_inode));
 
         readdir->pgbase = (char *)p - (char *)start;
         readdir->count -= readdir->pgbase;