diff options
| author | Chuck Lever <[email protected]> | 2023-09-29 09:59:31 -0400 |
|---|---|---|
| committer | Chuck Lever <[email protected]> | 2023-10-16 12:44:32 -0400 |
| commit | 841735b3fdfe518f21c80ca3ae48a1edfc957525 (patch) | |
| tree | 2923b6683e7417ef6bf5492cbe63d6d3a839281e | |
| parent | 802e191353e496f7ad5b00954b4643a1b8d726b5 (diff) | |
NFSD: Clean up nfsd4_encode_open()
Finish cleaning up nfsd4_encode_open().
Reviewed-by: Jeff Layton <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index cacd06949796..dcad27f734f6 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4212,20 +4212,23 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open = &u->open; struct xdr_stream *xdr = resp->xdr; + /* stateid */ nfserr = nfsd4_encode_stateid4(xdr, &open->op_stateid); - if (nfserr) + if (nfserr != nfs_ok) return nfserr; + /* cinfo */ nfserr = nfsd4_encode_change_info4(xdr, &open->op_cinfo); - if (nfserr) + if (nfserr != nfs_ok) return nfserr; - if (xdr_stream_encode_u32(xdr, open->op_rflags) < 0) - return nfserr_resource; - + /* rflags */ + nfserr = nfsd4_encode_uint32_t(xdr, open->op_rflags); + if (nfserr != nfs_ok) + return nfserr; + /* attrset */ nfserr = nfsd4_encode_bitmap4(xdr, open->op_bmval[0], open->op_bmval[1], open->op_bmval[2]); - if (nfserr) + if (nfserr != nfs_ok) return nfserr; - /* delegation */ return nfsd4_encode_open_delegation4(xdr, open); } |