From mboxrd@z Thu Jan 1 00:00:00 1970 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 A97ECC2D0E4 for ; Fri, 20 Nov 2020 20:37:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F5D5221EB for ; Fri, 20 Nov 2020 20:37:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M+5TmV35" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731500AbgKTUhc (ORCPT ); Fri, 20 Nov 2020 15:37:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731087AbgKTUhc (ORCPT ); Fri, 20 Nov 2020 15:37:32 -0500 Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 496F1C0613CF for ; Fri, 20 Nov 2020 12:37:32 -0800 (PST) Received: by mail-qk1-x743.google.com with SMTP id n132so10244838qke.1 for ; Fri, 20 Nov 2020 12:37:32 -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=bINWdid4826TqRTJcejOeR/TT+q5ab2GJmDQQsXOwCI=; b=M+5TmV35qydJlerfoONb3SWOSedrydW5TzXVBPPXSk0bHDfvSnuhEuAaDUAWM6Ar9m MPl32v56hTpqFpn75bSlIw+dvQDFj5gyDU0cLxnP9Hy/SM/rBYZrlNYaLbjE5KSqUyU6 ShIFGipgKtCTJ2wiizExI5psALXR67OrrCFPs9E4C5MDjrlCyPatvptmZnRWSI/HC1ub d/TsTjSXVrMAs1D+LVxPmdLRXwvIYwNww3vopKPmBI6rLVFQM3mIq36LzIXWD381ICW4 WDHKxujt8yEnewfs0ZfcY/iJ2uxjyI/3kZBehqxd4OwcS7yZonmqlOBmfD0LbzGTodTD qlSg== 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=bINWdid4826TqRTJcejOeR/TT+q5ab2GJmDQQsXOwCI=; b=RzYCg/en6wnSQk6X7FCx9NFJuJd7tMH8MoRoam+kjEoaGI2DkLqOE+6n29lij2BS5M /4sahx0eYrCdC4QEiQ6GZHSaknnd2/nA4dMizoTojN8QRJAAtIRDr8mVmTZdGUfvTJSJ NQ0rdeLZ//v/Lswryn01H0o/LyEm4VdrvkmRoLWcQvdjpS28+uwOEIdPIajT2kZzGP3Z R2eerCFWLvcuePV7fgHGOczd4+HSVXLSiaUkEQUqhz3CBpielIOix0dxQOII6AYz5BX4 x0grqAX6evPY0vZ3MTRopinepi7PS+2HP/LjzIwZJye8OZyr/lcMOjvcQ5vQd0RpE1er LrKg== X-Gm-Message-State: AOAM532hx1zsZBDvjsA5MgfbgUFcDx4wwjxH6CSwvuL5Zbn6FMGFVanZ SN0jR95UqaLoBfBviB5CQbVUN4D7kZU= X-Google-Smtp-Source: ABdhPJxSZsJc/3hf20iaNqIZyQVrEbDLR6561YqfEl2FLGADuwWIV2vmjhhKn+KgE2/GTfbqmew5yQ== X-Received: by 2002:a05:620a:22eb:: with SMTP id p11mr19542337qki.224.1605904651262; Fri, 20 Nov 2020 12:37:31 -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 k4sm2740260qki.2.2020.11.20.12.37.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Nov 2020 12:37:30 -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 0AKKbTN3029328 for ; Fri, 20 Nov 2020 20:37:29 GMT Subject: [PATCH v2 042/118] NFSD: Replace READ* macros in nfsd4_decode_remove() From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Fri, 20 Nov 2020 15:37:29 -0500 Message-ID: <160590464945.1340.2353090260642464897.stgit@klimt.1015granger.net> In-Reply-To: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> References: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 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/nfs4xdr.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 3a7b615aef62..964cfe3d9409 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1201,16 +1201,7 @@ nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, struct nfsd4_readdir *read static __be32 nfsd4_decode_remove(struct nfsd4_compoundargs *argp, struct nfsd4_remove *remove) { - DECODE_HEAD; - - READ_BUF(4); - remove->rm_namelen = be32_to_cpup(p++); - READ_BUF(remove->rm_namelen); - SAVEMEM(remove->rm_name, remove->rm_namelen); - if ((status = check_filename(remove->rm_name, remove->rm_namelen))) - return status; - - DECODE_TAIL; + return nfsd4_decode_component4(argp, &remove->rm_name, &remove->rm_namelen); } static __be32