Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFSD: Add an nfsd4_encode_nfs_cookie4() helper

Browse Source 
De-duplicate the entry4 cookie encoder, similar to the arrangement
for the NFSv2 and NFSv3 directory entry encoders.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2023-10-04 09:41:57 -04:00
parent a0d042f823
commit 3fc5048cb3
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/nfsd/nfs4xdr.c
View File

@ -3664,6 +3664,22 @@ __be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words,
return ret; return ret;
} }
/*
* The buffer space for this field was reserved during a previous
* call to nfsd4_encode_entry4().
*/
static void nfsd4_encode_entry4_nfs_cookie4(const struct nfsd4_readdir *readdir,
u64 offset)
{
__be64 cookie = cpu_to_be64(offset);
struct xdr_stream *xdr = readdir->xdr;
if (!readdir->cookie_offset)
return;
write_bytes_to_xdr_buf(xdr->buf, readdir->cookie_offset, &cookie,
sizeof(cookie));
}
static inline int attributes_need_mount(u32 *bmval) static inline int attributes_need_mount(u32 *bmval)
{ {
if (bmval[0] & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_LEASE_TIME)) if (bmval[0] & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_LEASE_TIME))
@ -3756,7 +3772,6 @@ nfsd4_encode_entry4(void *ccdv, const char *name, int namlen,
u32 name_and_cookie; u32 name_and_cookie;
int entry_bytes; int entry_bytes;
__be32 nfserr = nfserr_toosmall; __be32 nfserr = nfserr_toosmall;
__be64 wire_offset;
__be32 *p; __be32 *p;
/* In nfsv4, "." and ".." never make it onto the wire.. */ /* In nfsv4, "." and ".." never make it onto the wire.. */
@ -3765,11 +3780,8 @@ nfsd4_encode_entry4(void *ccdv, const char *name, int namlen,
return 0; return 0;
} }
if (cd->cookie_offset) { /* Encode the previous entry's cookie value */
wire_offset = cpu_to_be64(offset); nfsd4_encode_entry4_nfs_cookie4(cd, offset);
write_bytes_to_xdr_buf(xdr->buf, cd->cookie_offset,
&wire_offset, 8);
}
p = xdr_reserve_space(xdr, 4); p = xdr_reserve_space(xdr, 4);
if (!p) if (!p)
@ -4451,7 +4463,6 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr,
int maxcount; int maxcount;
int bytes_left; int bytes_left;
loff_t offset; loff_t offset;
__be64 wire_offset;
struct xdr_stream *xdr = resp->xdr; struct xdr_stream *xdr = resp->xdr;
int starting_len = xdr->buf->len; int starting_len = xdr->buf->len;
__be32 *p; __be32 *p;
@ -4509,11 +4520,8 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr,
if (nfserr) if (nfserr)
goto err_no_verf; goto err_no_verf;
if (readdir->cookie_offset) { /* Encode the final entry's cookie value */
wire_offset = cpu_to_be64(offset); nfsd4_encode_entry4_nfs_cookie4(readdir, offset);
write_bytes_to_xdr_buf(xdr->buf, readdir->cookie_offset,
&wire_offset, 8);
}
p = xdr_reserve_space(xdr, 8); p = xdr_reserve_space(xdr, 8);
if (!p) { if (!p) {