diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2005-01-04 05:45:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:45:20 -0800 |
| commit | ce1bad47c3d60f309ca3a23214863979e21ed676 (patch) | |
| tree | a15c7757b890300fd59b642a6f02c0c4d282b3dc /fs | |
| parent | 09b361444800f1c050db535875c9029434558425 (diff) | |
| download | history-ce1bad47c3d60f309ca3a23214863979e21ed676.tar.gz | |
[PATCH] knfsd: nfsd4: fix fileid in readdir responses
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 4cb725cf5cf879..ae7abb747523a8 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1800,7 +1800,7 @@ nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen, */ 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: |