lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] knfsd: allow nfsd READDIR to return 64bit cookies

Browse Source 
->readdir passes lofft_t offsets (used as nfs cookies) to
nfs3svc_encode_entry{,_plus}, but when they pass it on to encode_entry it
becomes an 'off_t', which isn't good.

So filesystems that returned 64bit offsets would lose.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
NeilBrown
2007-03-26 21:32:08 -08:00
committed by Linus Torvalds
parent ec28297a56
commit 598b9a5637
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs3xdr.c
View File

@ -859,8 +859,8 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
#define NFS3_ENTRY_BAGGAGE (2 + 1 + 2 + 1) #define NFS3_ENTRY_BAGGAGE (2 + 1 + 2 + 1)
#define NFS3_ENTRYPLUS_BAGGAGE (1 + 21 + 1 + (NFS3_FHSIZE >> 2)) #define NFS3_ENTRYPLUS_BAGGAGE (1 + 21 + 1 + (NFS3_FHSIZE >> 2))
static int static int
encode_entry(struct readdir_cd *ccd, const char *name, encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
int namlen, off_t offset, ino_t ino, unsigned int d_type, int plus) loff_t offset, ino_t ino, unsigned int d_type, int plus)
{ {
struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres, struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres,
common); common);
@ -880,7 +880,7 @@ encode_entry(struct readdir_cd *ccd, const char *name,
*cd->offset1 = htonl(offset64 & 0xffffffff); *cd->offset1 = htonl(offset64 & 0xffffffff);
cd->offset1 = NULL; cd->offset1 = NULL;
} else { } else {
xdr_encode_hyper(cd->offset, (u64) offset); xdr_encode_hyper(cd->offset, offset64);
} }
} }