mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

NFSD: Add a helper that encodes NFSv3 directory offset cookies

Browse source 
Refactor: Add helper function similar to nfs3svc_encode_cookie3().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-13 16:53:17 -05:00
parent bf15229f2c
commit d52532002f
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/nfsd/nfsproc.c
View file

@ -595,8 +595,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp)
&resp->common, nfssvc_encode_entry);
resp->count = resp->buffer - buffer;
if (resp->offset)
*resp->offset = htonl(offset);
nfssvc_encode_nfscookie(resp, offset);
fh_put(&argp->fh);
return rpc_success;

18
fs/nfsd/nfsxdr.c
View file

@ -614,6 +614,21 @@ nfssvc_encode_statfsres(struct svc_rqst *rqstp, __be32 *p)
return 1;
}
/**
* nfssvc_encode_nfscookie - Encode a directory offset cookie
* @resp: readdir result context
* @offset: offset cookie to encode
*
*/
void nfssvc_encode_nfscookie(struct nfsd_readdirres *resp, u32 offset)
{
if (!resp->offset)
return;
*resp->offset = cpu_to_be32(offset);
resp->offset = NULL;
}
int
nfssvc_encode_entry(void *ccdv, const char *name,
int namlen, loff_t offset, u64 ino, unsigned int d_type)
@ -632,8 +647,7 @@ nfssvc_encode_entry(void *ccdv, const char *name,
cd->common.err = nfserr_fbig;
return -EINVAL;
}
if (cd->offset)
*cd->offset = htonl(offset);
nfssvc_encode_nfscookie(cd, offset);
/* truncate filename */
namlen = min(namlen, NFS2_MAXNAMLEN);

1
fs/nfsd/xdr.h
View file

@ -157,6 +157,7 @@ int nfssvc_encode_readres(struct svc_rqst *, __be32 *);
int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *);
int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *);
void nfssvc_encode_nfscookie(struct nfsd_readdirres *resp, u32 offset);
int nfssvc_encode_entry(void *, const char *name,
int namlen, loff_t offset, u64 ino, unsigned int);