Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v1 54/61] NFSD: Replace READ* macros in nfsd4_decode_clone()
Date: Fri, 13 Nov 2020 10:07:07 -0500
Message-ID: <160528002768.6186.12249785285512383070.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <160527962905.6186.17550620763636619885.stgit@klimt.1015granger.net>

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfs4xdr.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 9afdb83c5c23..7e969f04f62f 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1968,20 +1968,26 @@ nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
 static __be32
 nfsd4_decode_clone(struct nfsd4_compoundargs *argp, struct nfsd4_clone *clone)
 {
-	DECODE_HEAD;
+	__be32 status;
 
 	status = nfsd4_decode_stateid4(argp, &clone->cl_src_stateid);
 	if (status)
 		return status;
 	status = nfsd4_decode_stateid4(argp, &clone->cl_dst_stateid);
 	if (status)
-		return status;
+		goto out;
+	if (xdr_stream_decode_u64(argp->xdr, &clone->cl_src_pos) < 0)
+		goto xdr_error;
+	if (xdr_stream_decode_u64(argp->xdr, &clone->cl_dst_pos) < 0)
+		goto xdr_error;
+	if (xdr_stream_decode_u64(argp->xdr, &clone->cl_count) < 0)
+		goto xdr_error;
 
-	READ_BUF(8 + 8 + 8);
-	p = xdr_decode_hyper(p, &clone->cl_src_pos);
-	p = xdr_decode_hyper(p, &clone->cl_dst_pos);
-	p = xdr_decode_hyper(p, &clone->cl_count);
-	DECODE_TAIL;
+	status = nfs_ok;
+out:
+	return status;
+xdr_error:
+	return nfserr_bad_xdr;
 }
 
 static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp,



  parent reply index

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13 15:02 [PATCH v1 00/61] Update NFSD XDR functions Chuck Lever
2020-11-13 15:02 ` [PATCH v1 01/61] NFSD: Fix returned READDIR offset cookie Chuck Lever
2020-11-13 15:02 ` [PATCH v1 02/61] SUNRPC: Add xdr_set_scratch_page() and xdr_reset_scratch_buffer() Chuck Lever
2020-11-13 15:02 ` [PATCH v1 03/61] SUNRPC: Prepare for xdr_stream-style decoding on the server-side Chuck Lever
2020-11-13 15:02 ` [PATCH v1 04/61] NFSD: Add common helpers to decode void args and encode void results Chuck Lever
2020-11-13 15:02 ` [PATCH v1 05/61] NFSD: Replace the internals of the READ_BUF() macro Chuck Lever
2020-11-13 15:02 ` [PATCH v1 06/61] NFSD: Replace READ* macros in nfsd4_decode_access() Chuck Lever
2020-11-14  9:28   ` Christoph Hellwig
2020-11-14 18:26     ` Chuck Lever
2020-11-14 18:45       ` Christoph Hellwig
2020-11-14 18:48         ` Chuck Lever
2020-11-14 18:49           ` Christoph Hellwig
2020-11-13 15:03 ` [PATCH v1 07/61] NFSD: Replace READ* macros in nfsd4_decode_close() Chuck Lever
2020-11-14  9:29   ` Christoph Hellwig
2020-11-14 18:30     ` Chuck Lever
2020-11-14 18:47       ` Christoph Hellwig
2020-11-13 15:03 ` [PATCH v1 08/61] NFSD: Replace READ* macros in nfsd4_decode_commit() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 09/61] NFSD: Replace READ* macros in nfsd4_decode_create() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 10/61] NFSD: Replace READ* macros in nfsd4_decode_bitmap() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 11/61] NFSD: Replace READ* macros in nfsd4_decode_link() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 12/61] NFSD: Relocate nfsd4_decode_opaque() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 13/61] NFSD: Replace READ* macros in nfsd4_decode_lock() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 14/61] NFSD: Replace READ* macros in nfsd4_decode_lockt() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 15/61] NFSD: Replace READ* macros in nfsd4_decode_locku() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 16/61] NFSD: Replace READ* macros in nfsd4_decode_lookup() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 17/61] NFSD: Replace READ* macros in nfsd4_decode_time() Chuck Lever
2020-11-13 15:03 ` [PATCH v1 18/61] NFSD: Replace READ* macros in nfsd4_decode_fattr() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 19/61] NFSD: Replace READ* macros in nfsd4_decode_open() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 20/61] NFSD: Replace READ* macros in nfsd4_decode_open_confirm() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 21/61] NFSD: Replace READ* macros in nfsd4_decode_open_downgrade() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 22/61] NFSD: Replace READ* macros in nfsd4_decode_putfh() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 23/61] NFSD: Replace READ* macros in nfsd4_decode_read() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 24/61] NFSD: Replace READ* macros in nfsd4_decode_readdir() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 25/61] NFSD: Replace READ* macros in nfsd4_decode_remove() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 26/61] NFSD: Replace READ* macros in nfsd4_decode_rename() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 27/61] NFSD: Replace READ* macros in nfsd4_decode_renew() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 28/61] NFSD: Replace READ* macros in nfsd4_decode_secinfo() Chuck Lever
2020-11-13 15:04 ` [PATCH v1 29/61] NFSD: Replace READ* macros in nfsd4_decode_setclientid() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 30/61] NFSD: Replace READ* macros in nfsd4_decode_setclientid_confirm() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 31/61] NFSD: Replace READ* macros in nfsd4_decode_verify() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 32/61] NFSD: Replace READ* macros in nfsd4_decode_write() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 33/61] NFSD: Replace READ* macros in nfsd4_decode_release_lockowner() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 34/61] NFSD: Replace READ* macros in nfsd4_decode_cb_sec() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 35/61] NFSD: Replace READ* macros in nfsd4_decode_backchannel_ctl() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 36/61] NFSD: Replace READ* macros in nfsd4_decode_bind_conn_to_session() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 37/61] NFSD: Add a separate decoder to handle state_protect_ops Chuck Lever
2020-11-13 15:05 ` [PATCH v1 38/61] NFSD: Add a separate decoder for ssv_sp_parms Chuck Lever
2020-11-13 15:05 ` [PATCH v1 39/61] NFSD: Add a helper to decode state_protect4_a Chuck Lever
2020-11-13 15:05 ` [PATCH v1 40/61] NFSD: Replace READ* macros in nfsd4_decode_exchange_id() Chuck Lever
2020-11-13 15:05 ` [PATCH v1 41/61] NFSD: Replace READ* macros in nfsd4_decode_create_session() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 42/61] NFSD: Replace READ* macros in nfsd4_decode_destroy_session() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 43/61] NFSD: Replace READ* macros in nfsd4_decode_free_stateid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 44/61] NFSD: Replace READ* macros in nfsd4_decode_getdeviceinfo() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 45/61] NFSD: Replace READ* macros in nfsd4_decode_layoutcommit() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 46/61] NFSD: Replace READ* macros in nfsd4_decode_layoutget() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 47/61] NFSD: Replace READ* macros in nfsd4_decode_layoutreturn() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 48/61] NFSD: Replace READ* macros in nfsd4_decode_secinfo_no_name() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 49/61] NFSD: Replace READ* macros in nfsd4_decode_sequence() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 50/61] NFSD: Replace READ* macros in nfsd4_decode_test_stateid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 51/61] NFSD: Replace READ* macros in nfsd4_decode_destroy_clientid() Chuck Lever
2020-11-13 15:06 ` [PATCH v1 52/61] NFSD: Replace READ* macros in nfsd4_decode_reclaim_complete() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 53/61] NFSD: Replace READ* macros in nfsd4_decode_fallocate() Chuck Lever
2020-11-13 15:07 ` Chuck Lever [this message]
2020-11-13 15:07 ` [PATCH v1 55/61] NFSD: Replace READ* macros in nfsd4_decode_copy() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 56/61] NFSD: Replace READ* macros in nfsd4_decode_seek() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 57/61] NFSD: Replace READ* macros in nfsd4_decode_xattr_name() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 58/61] NFSD: Replace READ* macros in nfsd4_decode_setxattr() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 59/61] NFSD: Replace READ* macros in nfsd4_decode_listxattrs() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 60/61] NFSD: Replace READ* macros in nfsd4_decode_compound() Chuck Lever
2020-11-13 15:07 ` [PATCH v1 61/61] NFSD: Remove macros that are no longer used Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=160528002768.6186.12249785285512383070.stgit@klimt.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org
	public-inbox-index linux-nfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git