nfsd: Use correct error code when decoding extents
Subsystems (3)
PATCH v3 1/1 nfsd: Use correct error code when decoding extents
Update error codes in decoding functions of block and scsi layout drivers to match the core nfsd code. NFS4ERR_EINVAL means that the server was able to decode the request, but the decoded values are invalid. Use NFS4ERR_BADXDR instead to indicate a decoding error. And ENOMEM is changed to nfs code NFS4ERR_DELAY.
---
Changes in v3:
- Add nfserr_delay define
- Return number of iomaps and nfserror as separate values
fs/nfsd/blocklayout.c | 20 ++++++----- fs/nfsd/blocklayoutxdr.c | 71 +++++++++++++++++++++++++++++++--------- fs/nfsd/blocklayoutxdr.h | 8 ++--- fs/nfsd/nfsd.h | 1 + 4 files changed, 73 insertions(+), 27 deletions(-)
fs/nfsd/blocklayout.c +12 -8
@@ -178,11 +178,13 @@ nfsd4_block_proc_layoutcommit(struct inode *inode, {struct iomap *iomaps;int nr_iomaps; +__be32 nfserr; - nr_iomaps =nfsd4_block_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps,i_blocksize (inode)); -if (nr_iomaps <0 ) -return nfserrno (nr_iomaps); + nfserr =nfsd4_block_decode_layoutupdate (lcp->lc_up_layout, + lcp->lc_up_len, &iomaps, &nr_iomaps, +i_blocksize (inode)); +if (nfserr != nfs_ok) +return nfserr;return nfsd4_block_commit_blocks (inode, lcp, iomaps, nr_iomaps); }
@@ -316,11 +318,13 @@ nfsd4_scsi_proc_layoutcommit(struct inode *inode, {struct iomap *iomaps;int nr_iomaps; +__be32 nfserr; - nr_iomaps =nfsd4_scsi_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps,i_blocksize (inode)); -if (nr_iomaps <0 ) -return nfserrno (nr_iomaps); + nfserr =nfsd4_scsi_decode_layoutupdate (lcp->lc_up_layout, + lcp->lc_up_len, &iomaps, &nr_iomaps, +i_blocksize (inode)); +if (nfserr != nfs_ok) +return nfserr;return nfsd4_block_commit_blocks (inode, lcp, iomaps, nr_iomaps); }
fs/nfsd/blocklayoutxdr.c +56 -15
133 lines not on this page · raw message
fs/nfsd/blocklayoutxdr.h +4 -4
@@ -54,9 +54,9 @@ __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr, const struct nfsd4_getdeviceinfo *gdp);__be32 nfsd4_block_encode_layoutget (struct xdr_stream *xdr,const struct nfsd4_layoutget *lgp); -int nfsd4_block_decode_layoutupdate (__be32 *p,u32 len,struct iomap **iomapp, -u32 block_size); -int nfsd4_scsi_decode_layoutupdate (__be32 *p,u32 len,struct iomap **iomapp, -u32 block_size); +__be32 nfsd4_block_decode_layoutupdate (__be32 *p,u32 len, +struct iomap **iomapp,int *nr_iomapsp,u32 block_size); +__be32 nfsd4_scsi_decode_layoutupdate (__be32 *p,u32 len, +struct iomap **iomapp,int *nr_iomapsp,u32 block_size);#endif /* _NFSD_BLOCKLAYOUTXDR_H */
fs/nfsd/nfsd.h +1 -0
@@ -283,6 +283,7 @@ void nfsd_lockd_shutdown(void);#define nfserr_cb_path_down cpu_to_be32(NFSERR_CB_PATH_DOWN)#define nfserr_locked cpu_to_be32(NFSERR_LOCKED)#define nfserr_wrongsec cpu_to_be32(NFSERR_WRONGSEC) +#define nfserr_delay cpu_to_be32(NFS4ERR_DELAY)#define nfserr_badiomode cpu_to_be32(NFS4ERR_BADIOMODE)#define nfserr_badlayout cpu_to_be32(NFS4ERR_BADLAYOUT)#define nfserr_bad_session_digest cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)
Signature · 1 line
2.43.0
Looks good:
Chuck Lever
maintainerFrom: Chuck Lever <[email protected]>
Quoted 8 lines · Sergey Bashirov
Update error codes in decoding functions of block and scsi layout drivers to match the core nfsd code.
NFS4ERR_EINVALmeans that the server was able to decode the request, but the decoded values are invalid. UseNFS4ERR_BADXDRinstead to indicate a decoding error. And ENOMEM is changed to nfs codeNFS4ERR_DELAY.[...]
Applied to nfsd-testing, thanks!
[1/1] nfsd: Use correct error code when decoding extents
commit: 9558037b8e9d90f099f1c6387151ad3282c28b66
--
Chuck Lever