
From: NeilBrown <neilb@cse.unsw.edu.au>

We were reporting mounted_on fileid instead of fileid in readdir responses.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/fs/nfsd/nfs4xdr.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN fs/nfsd/nfs4xdr.c~knfsd-nfsd4-fix-fileid-in-readdir-responses fs/nfsd/nfs4xdr.c
--- 25/fs/nfsd/nfs4xdr.c~knfsd-nfsd4-fix-fileid-in-readdir-responses	2004-11-15 22:07:03.878999304 -0800
+++ 25-akpm/fs/nfsd/nfs4xdr.c	2004-11-15 22:07:03.884998392 -0800
@@ -1800,7 +1800,7 @@ nfsd4_encode_dirent(struct readdir_cd *c
 	 */
 	bmval0 = cd->rd_bmval[0];
 	bmval1 = cd->rd_bmval[1];
-	if ((bmval0 & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_FILEID)) || bmval1)  {
+	if ((bmval0 & ~(FATTR4_WORD0_RDATTR_ERROR)) || bmval1)  {
 		/*
 		 * "Heavyweight" case: we have no choice except to
 		 * call nfsd4_encode_fattr(). 
@@ -1876,8 +1876,6 @@ error:
 	attrlenp = p++;
 	if (bmval0 & FATTR4_WORD0_RDATTR_ERROR)
 		*p++ = nfserr;       /* no htonl */
-	if (bmval0 & FATTR4_WORD0_FILEID)
-		p = xdr_encode_hyper(p, (u64)ino);
 	*attrlenp = htonl((char *)p - (char *)attrlenp - 4);
 
 out:
_
