|
@@ -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,
|
|
|
|
- int namlen, off_t offset, ino_t ino, unsigned int d_type, int plus)
|
|
|
|
|
|
+encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
|
|
|
|
+ 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);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|