Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3326298pxb; Mon, 1 Mar 2021 07:19:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWedf7+I5CWte7AmtzdXmrUPPSfwSxqocaGdMHZMr7B7oTIfkZWnCScdBL3LaKYM11nrO8 X-Received: by 2002:a17:907:2054:: with SMTP id pg20mr9045487ejb.213.1614611956468; Mon, 01 Mar 2021 07:19:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614611956; cv=none; d=google.com; s=arc-20160816; b=A8fHX5IkekFWYfVVveg//3bvwD6nl8f21rnJ600RZcWxb8KtJ8o5RSH8jtt9TeSoa0 Ek1Bv3O8fehKa/uJvAPoF9JNhW8abqLnPcSNgWJYbT753Y1HUbtgMUa2paulFujdKC45 sqremq/TkHXEP2wy/oHP3CZAdS6gw7xGUazORPDwaj/rmqD+hJ/Dq2I6rBO9QWtkD2m1 vaWSpMS1HxWvPixvo+ibi2TDzOItb9CR+dlAaH9CygBB8JmjduZkRcOL0FURtQb0Gj/x e+4rwNt6XrNFTxil+U8E+3D5F8xtl2E7jne49o9QAC3uejsevAwI5kl689h5lxYwsa/W lsBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject; bh=TYPI5rAv5DRK9gP/7jYBPkkly6ID9hyUvBZVlHqlvlA=; b=kXknBz1W0Ar1qopcrCYPeQS+JbVt+2KhnqD4hu0ntUjJ4aAD82P62NZZUdgLv4j8Ws ioHWgwEeqwI/TGBllffiW365729OZbmRrEX3JwS11neRlYh4BZX5ZOt7ssrrR7X1zf+O 7j47hNhfAe74EuAwimez7OOZlavJcR6hgnYReJBmn2KFmlfyc5P1Q0mVihKrwDkZG47o JGqDMzoJ6joLQCUB/GChQAbOmWsg6iBYeoHrz0Lld6hqZ8NVookFmtBBNMDc9hM5ACWh eBfYKvQ+88qlwxrZoDP0CUvPwyyNxFKovAStZi6qqsh1EbEHVLgOybuMHAH0J5jDfp93 719A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j10si11076982eje.450.2021.03.01.07.18.53; Mon, 01 Mar 2021 07:19:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237018AbhCAPR1 (ORCPT + 99 others); Mon, 1 Mar 2021 10:17:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:40728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236841AbhCAPRZ (ORCPT ); Mon, 1 Mar 2021 10:17:25 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F3A464E40 for ; Mon, 1 Mar 2021 15:16:19 +0000 (UTC) Subject: [PATCH v1 10/42] NFSD: Update the NFSv3 RENAMEv3res encoder to use struct xdr_stream From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Mon, 01 Mar 2021 10:16:18 -0500 Message-ID: <161461177890.8508.9249115229545082629.stgit@klimt.1015granger.net> In-Reply-To: <161461145466.8508.13379815439337754427.stgit@klimt.1015granger.net> References: <161461145466.8508.13379815439337754427.stgit@klimt.1015granger.net> User-Agent: StGit/1.0-5-g755c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Chuck Lever --- fs/nfsd/nfs3xdr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 052376a65f72..1d52a69562b8 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -1116,12 +1116,12 @@ nfs3svc_encode_createres(struct svc_rqst *rqstp, __be32 *p) int nfs3svc_encode_renameres(struct svc_rqst *rqstp, __be32 *p) { + struct xdr_stream *xdr = &rqstp->rq_res_stream; struct nfsd3_renameres *resp = rqstp->rq_resp; - *p++ = resp->status; - p = encode_wcc_data(rqstp, p, &resp->ffh); - p = encode_wcc_data(rqstp, p, &resp->tfh); - return xdr_ressize_check(rqstp, p); + return svcxdr_encode_nfsstat3(xdr, resp->status) && + svcxdr_encode_wcc_data(rqstp, xdr, &resp->ffh) && + svcxdr_encode_wcc_data(rqstp, xdr, &resp->tfh); } /* LINK */