Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3974153pxf; Mon, 29 Mar 2021 17:21:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+Knw1KTJJktFoJowBcdJypzcxi8y92uV1SyGRHfZq5ENzT/3A3WgVnxIe0bEav/4bFGRl X-Received: by 2002:a17:906:1386:: with SMTP id f6mr30606465ejc.45.1617063667810; Mon, 29 Mar 2021 17:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617063667; cv=none; d=google.com; s=arc-20160816; b=aWecBMPOOWz0S67yoU/DdRhc6KdoB2P3HYBCZSwwh0H+7cma17/Ax1xMsKW6z+0y89 YZAn+iXhwmHDifRyQRf2rSKW5G4vPolQ5N/M4BiwYTO54CRXGTEhY8ChyT5c4SrQK2CS y3yYQfSSS5c7qQwbsVktr6X2ZCrZDnHLxTmgpcumsWwZk58WDc/HBb3kvTymeN4MMF7S MmSwo4U1mpDPoXdVJOzpd94Nwv777AwMH89tc3yRHM/IeMO8sUQNX2FDbKpL5JQMlGkP EeuynL3dcROptBSjvvYOfnBCk+TeBm3sO/ZoyrgkbMezUmPA0AoCxd+jNOJMn25rSd+K c5/Q== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=gNIMQfwV7Gr+wJf19x8RSivWlWSIVlc8tidxi/xdaqk=; b=pPvY8qWTtGkcwlnYWyUsoxCtGS0WnO8frqN9VXMJwgz5yHVc0mcf7TlhQXmC3xYJ3C 5r300BdxJRd1ZLf/QnVwMR3meDiwgF+MiuolejYI74V41jHPQo9ez3CrXT6JDSuq1ptq jLcE1szOgTjceEyJJuOQMdufeXBB2B+UeNqh7iU6tFIFD93K4WzciJ/fXiDot4m6+Dn/ sbiF7LjA+mSRUed8sq4Y0o50Prf77ok1ejVS/dlgnV6ZqVxqcaw/+TRbZa48f4qSiT4+ zYNFZp7C7/k7j8Uwl10t1Lqqj/DHFfDFwZMv8Uf05zO3cQ9vbpMWC+eAqRzMz28GKhgo QrRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pHNy4rXf; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g3si13404459edr.463.2021.03.29.17.20.44; Mon, 29 Mar 2021 17:21:07 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=pHNy4rXf; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230223AbhC3ATQ (ORCPT + 99 others); Mon, 29 Mar 2021 20:19:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:50406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbhC3ASr (ORCPT ); Mon, 29 Mar 2021 20:18:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D597960C41 for ; Tue, 30 Mar 2021 00:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617063527; bh=q48Ky1nmUGHIcEwWxnjWjx302h1CqIWJtkjhILW9cRg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pHNy4rXfP9AD6nb4CpOFHWRw7O4CxFEYEVvFjUsnoLgt4n8fVf/lPXcDVUdCoL4Fb Xo4d4Qgtpo3DaBqFduDET6Q6QTBg3Px3iiMB4WQQrJfY7BdLTyf0uRfDo9GE+f1hiI qkIYMU6KcoJMuDgx9J41Y7Uizn2idP0wesmDBWqG4JNbB3XkoRowm7D7AY6z58nD3a yZRUKSINGZ+H99QZ5lo6BFaEl9iRsQ+aNYMLG+IPvGy4MBZj7EU4G9058jPxwxYv0I bdEmV9Jp9Q90OBc5prxbC/hcxzXYL2E0QLcGuQtrqUWdyP5D/uD4XUbM+i3yqqoxpN VieyOTFxMIcRQ== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH 15/17] NFSv4: Fix value of decode_fsinfo_maxsz Date: Mon, 29 Mar 2021 20:18:33 -0400 Message-Id: <20210330001835.41914-16-trondmy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210330001835.41914-15-trondmy@kernel.org> References: <20210330001835.41914-1-trondmy@kernel.org> <20210330001835.41914-2-trondmy@kernel.org> <20210330001835.41914-3-trondmy@kernel.org> <20210330001835.41914-4-trondmy@kernel.org> <20210330001835.41914-5-trondmy@kernel.org> <20210330001835.41914-6-trondmy@kernel.org> <20210330001835.41914-7-trondmy@kernel.org> <20210330001835.41914-8-trondmy@kernel.org> <20210330001835.41914-9-trondmy@kernel.org> <20210330001835.41914-10-trondmy@kernel.org> <20210330001835.41914-11-trondmy@kernel.org> <20210330001835.41914-12-trondmy@kernel.org> <20210330001835.41914-13-trondmy@kernel.org> <20210330001835.41914-14-trondmy@kernel.org> <20210330001835.41914-15-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust At least two extra fields have been added to fsinfo since this was last updated. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index ac6b79ee9355..d8a1911dd39e 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -144,7 +144,16 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req, * layout types will be returned. */ #define decode_fsinfo_maxsz (op_decode_hdr_maxsz + \ - nfs4_fattr_bitmap_maxsz + 4 + 8 + 5) + nfs4_fattr_bitmap_maxsz + 1 + \ + 1 /* lease time */ + \ + 2 /* max filesize */ + \ + 2 /* max read */ + \ + 2 /* max write */ + \ + nfstime4_maxsz /* time delta */ + \ + 5 /* fs layout types */ + \ + 1 /* layout blksize */ + \ + 1 /* clone blksize */ + \ + 1 /* xattr support */) #define encode_renew_maxsz (op_encode_hdr_maxsz + 3) #define decode_renew_maxsz (op_decode_hdr_maxsz) #define encode_setclientid_maxsz \ -- 2.30.2