Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp50051pxb; Wed, 14 Apr 2021 09:10:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUQK/F9bsS+14GB08+HJ9nVOMYNwKDALk0amgWOIO9zii2hOzD4cj57zRMJu/jF9Zilqjc X-Received: by 2002:a17:906:5585:: with SMTP id y5mr5685923ejp.129.1618416622392; Wed, 14 Apr 2021 09:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618416622; cv=none; d=google.com; s=arc-20160816; b=QlX1e5Krwx2NpNXVhFUqaGdlaiGTE0sGwue71JPPepOpR8dPoZKNQvUFOX5aZfozd9 No9qf00wZhKDdQXw/HGYN5wthCU9CqfE2i1Psg95zfz0/w2svHQGRCH37AVTWg0vVuVz QJcZKrePMyYrhKUTlokfNioLb6wlLXhSUmVU8T8ljgRVNJWXY2cA7dvIXUKprF8mbqwo zwV47buVxr4A1ZPcEzcUPM+jzpv++W+vUlrxgtrmJZ89H7wOjWojmOQsYMseARBO5pRc xrGdqhEJumAteJklhTm8GAmMZLSXAc4cHNtjdScAQbl9H4k1DBd0Axnn9hqF4GK3Fi6B VrHw== 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=XUbDR9nOEupGXGCrX1NVhiSJMTHq4V1VdfS+yIyhoItB8zfkNBp/+9WG/ft6ru4EB/ TBWhhbjeLNjEUBBDFhbhlAQYWnQzpyboR9zDp5vCbetWRrip26JDuVPqzWt3rrbOknxZ 6XLevEMc5ZeFNcSAbVYFFYu39am7tC9BJ41cMR+vObhtY+EW52DQrdD1oYxUXwuWoF9Q cIcjD6hIDExGf9svqt8UxsnB2883kpVkpW1+Svuiflbe5ErGihLWJ5mcxtTU6jhc1FnJ 3rwP8Ha9AiDIJAF817rs/pe4oSX6ZS14d6aaXr4ZHEMDoQu8lfYCq7LmOgTKRsiU9jvP 6VQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VahL8dUE; 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 r21si12861575ejc.339.2021.04.14.09.09.59; Wed, 14 Apr 2021 09:10:22 -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=VahL8dUE; 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 S1351577AbhDNNoj (ORCPT + 99 others); Wed, 14 Apr 2021 09:44:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:52150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351611AbhDNNoY (ORCPT ); Wed, 14 Apr 2021 09:44:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EB437611F2 for ; Wed, 14 Apr 2021 13:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618407843; bh=q48Ky1nmUGHIcEwWxnjWjx302h1CqIWJtkjhILW9cRg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VahL8dUEqpHO0tu1pFExulwvsjiVE3gcE3SnZlJ4kSNIlLC97NkpIwlC4UXsUtc+5 uhl7+ftsWjg8YDFREAig80cVPHN3UHaOapzKYMKJxEEjWLr2f9SKq0+NYEOQZY7D/o P41Lx684c1z+D4+cu4rl9BK4PMmhwwZIgHvv+wWzsvP6iPV9gQzJ+MI6Q4BwsaKGkZ aetNPGBiw1wVh6WV/X5U+7JYcOd0hf8kGLOKbdqaBfyabGkt4/q0AM/94C10WL+Ua0 aOXcxPfFcBry85oJfrpcX8rNMlJOdJivUAnULNcGDt3Xs459zxe8jlUAG0bN2LWV1Q saVALbctB74EQ== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH v2 18/26] NFSv4: Fix value of decode_fsinfo_maxsz Date: Wed, 14 Apr 2021 09:43:45 -0400 Message-Id: <20210414134353.11860-19-trondmy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210414134353.11860-18-trondmy@kernel.org> References: <20210414134353.11860-1-trondmy@kernel.org> <20210414134353.11860-2-trondmy@kernel.org> <20210414134353.11860-3-trondmy@kernel.org> <20210414134353.11860-4-trondmy@kernel.org> <20210414134353.11860-5-trondmy@kernel.org> <20210414134353.11860-6-trondmy@kernel.org> <20210414134353.11860-7-trondmy@kernel.org> <20210414134353.11860-8-trondmy@kernel.org> <20210414134353.11860-9-trondmy@kernel.org> <20210414134353.11860-10-trondmy@kernel.org> <20210414134353.11860-11-trondmy@kernel.org> <20210414134353.11860-12-trondmy@kernel.org> <20210414134353.11860-13-trondmy@kernel.org> <20210414134353.11860-14-trondmy@kernel.org> <20210414134353.11860-15-trondmy@kernel.org> <20210414134353.11860-16-trondmy@kernel.org> <20210414134353.11860-17-trondmy@kernel.org> <20210414134353.11860-18-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