From patchwork Tue Jan 5 15:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 11999275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87496C433DB for ; Tue, 5 Jan 2021 15:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51F2922AAA for ; Tue, 5 Jan 2021 15:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727827AbhAEPbS (ORCPT ); Tue, 5 Jan 2021 10:31:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727680AbhAEPbS (ORCPT ); Tue, 5 Jan 2021 10:31:18 -0500 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 005C4C061796 for ; Tue, 5 Jan 2021 07:31:02 -0800 (PST) Received: by mail-qk1-x72d.google.com with SMTP id v126so26712475qkd.11 for ; Tue, 05 Jan 2021 07:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=0Y8TkPWSG0A5AAw5oQM15pPVLvuUh1CSHPSe4B7fuGA=; b=U4lELdMKqMjxuhgPD2X2kZAQbLL4hAY7brXDJVUC/im4L6e3fpt+c6l2fStW6NrmXO PtUBDUocpMlfe31xGuTCWBDL/75gzM1jycqIjgnLRwvZOMdiECSdN7YPi4rz8fbcw8J+ SMQVMSEdowcXE/CPiAEPiY0ybFXDGZNyStQl+AGLlZYkFyEyZgmKiSVCkPVcUtVfHNtL rIeqg3jV6ba/Wdnrgh/OtJbvb3Mne3Ag4nqEOhFU9w3LGEh0vL8UClWP66NbucNJViQl Ap/MmB+CHPiNYC5ooi5IgZO74rFkLFpH6Pyy3veCjyC8G8PlbM+NDIX8tNWVKVH+Wlbk lYhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=0Y8TkPWSG0A5AAw5oQM15pPVLvuUh1CSHPSe4B7fuGA=; b=nkIQShBEAuNeLjqXk1yuJ05dCvvOECpcZ0P5m4PhZQ8YytZLB4K5Owy+rTRekofPQS XR8C+77aIn/mGiSbDuHBaUcR4SCcNv4nStSwGPSHYbwpCVuBEWjXhSNT2k0bnT92xinI DMNr0YuheHtE+NSGKS6LuJYdUxDYoukvAeVdJp23fBrYJgC6H/nisJn4pl76Fg2CwY6E 759ojJlX88O4b2rJXWFYhdgOWe+K3KNpdJH5n26BUp3KPoOLDmEhPM8jz8QrTGSJGijl E43Jc1Uc7L0ear4zrhHtCywpxcyaTtDMcIJGqRYPuVYtePcolOR5d6XpG+rMt1DUks4N H2XQ== X-Gm-Message-State: AOAM5317DbZsaY1qjKndPUcjwSx3yhUkZSl19byzTG71cW4nPhVh7srt lx4aD4+HVcQ4imYiZokyDFU8ziPAtaw= X-Google-Smtp-Source: ABdhPJw092qalrCBTP5XMH0tWaqMqO5egz+tPS6INRa151474YIsYHjYtJyU3h1rwEac14eCZiRBdA== X-Received: by 2002:a05:620a:528:: with SMTP id h8mr91882qkh.40.1609860661932; Tue, 05 Jan 2021 07:31:01 -0800 (PST) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id n62sm127557qkn.125.2021.01.05.07.31.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jan 2021 07:31:00 -0800 (PST) Sender: Chuck Lever Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 105FUxPl020865 for ; Tue, 5 Jan 2021 15:30:59 GMT Subject: [PATCH v1 15/42] NFSD: Update the LINK3args decoder to use struct xdr_stream From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Tue, 05 Jan 2021 10:30:59 -0500 Message-ID: <160986065972.5532.14792984567589235354.stgit@klimt.1015granger.net> In-Reply-To: <160986050640.5532.16498408936966394862.stgit@klimt.1015granger.net> References: <160986050640.5532.16498408936966394862.stgit@klimt.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Chuck Lever --- fs/nfsd/nfs3xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index a5bbf9571821..ba5ec9cdafa1 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -574,14 +574,12 @@ nfs3svc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p) int nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p) { + struct xdr_stream *xdr = &rqstp->rq_arg_stream; struct nfsd3_linkargs *args = rqstp->rq_argp; - if (!(p = decode_fh(p, &args->ffh)) - || !(p = decode_fh(p, &args->tfh)) - || !(p = decode_filename(p, &args->tname, &args->tlen))) - return 0; - - return xdr_argsize_check(rqstp, p); + return svcxdr_decode_nfs_fh3(xdr, &args->ffh) && + svcxdr_decode_diropargs3(xdr, &args->tfh, + &args->tname, &args->tlen); } int