Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1559929pxb; Fri, 20 Nov 2020 12:35:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0y/thKWu59MNkcTebJ26kSbFJD1D7gTEl0EfsMKTDQNK8uB1V3oH19UhVQKgurlFX1wlM X-Received: by 2002:a50:99da:: with SMTP id n26mr5220011edb.284.1605904537820; Fri, 20 Nov 2020 12:35:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605904537; cv=none; d=google.com; s=arc-20160816; b=oce+rbkNqpa3qaNIMjYlyn1Wa/x08HAzQzXqDz5kuMC/IPAdcFNEFg6+9VkoaZ7Zk9 r1d1ajxZBKaHYVUgQx0IVEh6U2YU3zGr/Y38MTbCC+YmXOpjCzEOA2RSVjF5hPkW31f1 I262PMdHRb8TIDVYvVC9YxWXrYNmZsjK//Ug1B1nLeR5AjhRs4kxwmIEGYIuP2y8Agkd 8ZblJ4W/xQuSeO4waP6ObE1cT9TPOl/P/vAdRZKED8LiOJZX/PZ9vTdmPFHW4EIwEYBG suyhl4CrtJ+Jf/8/EyS8AB7Ce3K0tSkRS+ZKZjdkd6D0i0WR1JwSEY5L/bgMGxqaRrtJ Z2Lg== 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 :sender:dkim-signature; bh=ZHKC7O7bKMdtBlGOzhOf6cKLSnD5Yst/iMkIzzR6Sak=; b=PG1rNpSvTFRXGyCeOnGHH34eWBK40/RuBCau4klD455wvxS4S1U9ZoK2y0jA7KFcK8 dGunHrMIUHAviBxVQoqtKqs/wVw1WRX2SBOO2TArMNBSaliPdcZheHnkQxtnqHEXhTYb 0lM02p4QtiWm/IpFb/guNB/d+i0fpr+Z11Ne+XSJg/RDpvjeOcI4vAZxg/qNGgZRAskP OhqF/OL6w8kY6d3k0pVtbadpRk4AUW0DEMzqS6Cr+m/5X9Us9qESpmLW9cx/qlV9syPz M0G4visowwDgLRqzkvUtbSoKDC44lOUScsn2TkW2C2/159HIKG/qN1yK1BvkksRezR1Q 0iiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mBSwpAzw; 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 lj4si2342037ejb.289.2020.11.20.12.35.15; Fri, 20 Nov 2020 12:35:37 -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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mBSwpAzw; 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 S1731207AbgKTUec (ORCPT + 99 others); Fri, 20 Nov 2020 15:34:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731075AbgKTUeb (ORCPT ); Fri, 20 Nov 2020 15:34:31 -0500 Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE9FC0613CF for ; Fri, 20 Nov 2020 12:34:31 -0800 (PST) Received: by mail-qv1-xf41.google.com with SMTP id g19so5329712qvy.2 for ; Fri, 20 Nov 2020 12:34:31 -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=ZHKC7O7bKMdtBlGOzhOf6cKLSnD5Yst/iMkIzzR6Sak=; b=mBSwpAzw3O+Od/FWcf5WrbOyrNFaXpjSocIOGk//7Ax5vQKQG/6NEekEvHvJrZN5Q1 1Q2zgTNLgz4XizDM5xx13jCn8o34MoULdIlc/ezWyRnWvMSYlMCFWRr6ZRq+PVq0Enfv cDpgJK1T5cUgeIXXQezFr0ZRW2MEhZWUrcM6XhEGST6J0vnHzvME+jwL/XNSx2UtDi6J 3Snm7pbBsKxjBEKhDa3F2wR4q7qfSUyEa7EwiB/RUI/wHn0vSR26BaFEjJ3YrUEYZBJx KVPGvizvNwQyncVwg7H3RRuf6wEno34wfrkHKPVlBa89/8FXCP4/zwU6atQzDZJ8GftN IHBw== 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=ZHKC7O7bKMdtBlGOzhOf6cKLSnD5Yst/iMkIzzR6Sak=; b=sbrvoxsLo1dgTpfPiuhpSQFfcsEwe8p5+AIUuYyN8/PuLpOKIIStOeGCqdPE7EsVAr 34FAUJCsGS3dx023EygV4ZlTqrb/dlNPsXU/vy4T9+f9vaF3GVqRV2wp+iC3UZ2yzibY paPkYWLM3OiDYY6No5qKJBC1f/N8MGOnmmLyLIRaNvOxfs1FSY7w0uWRCeWqgYf1418y Y44/+3HQHXpewjmqbgPDyyUXkTcLjd2aaes1Km92IVAW2NgWRmL3xuNQ+y7yaKxjb4Mv V1vv7yQVUFlaQf0cvVehJvHuop8eWnFd6BdDjFa6L3RjNNTDijIdB6g5Jv2dGaCjJFL3 xfpg== X-Gm-Message-State: AOAM530K7upYE7q1ATAVBKpI2HzOqmjSFaLAqbvAUKTFOtPKcfGK5V9Z kZFDbehpl/buEkrqWS/sPCqiyyeKYfw= X-Received: by 2002:a0c:c38f:: with SMTP id o15mr16065793qvi.12.1605904470218; Fri, 20 Nov 2020 12:34:30 -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 c1sm2774646qkd.74.2020.11.20.12.34.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Nov 2020 12:34:29 -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 0AKKYSxW029226 for ; Fri, 20 Nov 2020 20:34:28 GMT Subject: [PATCH v2 008/118] NFSD: Replace READ* macros in nfsd4_decode_close() From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Fri, 20 Nov 2020 15:34:28 -0500 Message-ID: <160590446846.1340.9664040070243046724.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 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 027582d682ae..06028e4f1b5d 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -558,13 +558,9 @@ static __be32 nfsd4_decode_bind_conn_to_session(struct nfsd4_compoundargs *argp, static __be32 nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close) { - DECODE_HEAD; - - READ_BUF(4); - close->cl_seqid = be32_to_cpup(p++); + if (xdr_stream_decode_u32(argp->xdr, &close->cl_seqid) < 0) + return nfserr_bad_xdr; return nfsd4_decode_stateid4(argp, &close->cl_stateid); - - DECODE_TAIL; }