From patchwork Sat Feb 18 18:18:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1FE6760586 for ; Sat, 18 Feb 2017 18:18:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11C4B27B13 for ; Sat, 18 Feb 2017 18:18:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0649228711; Sat, 18 Feb 2017 18:18:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ED89286F0 for ; Sat, 18 Feb 2017 18:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753473AbdBRSSR (ORCPT ); Sat, 18 Feb 2017 13:18:17 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:34486 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753346AbdBRSSP (ORCPT ); Sat, 18 Feb 2017 13:18:15 -0500 Received: by mail-it0-f67.google.com with SMTP id r141so6741927ita.1 for ; Sat, 18 Feb 2017 10:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=22I2PYtMOsA2Um7H45ZE48RpuIhSc6M+BF9XYocrVvc=; b=buFn+e6hyrYpOBL7JQ4lccEWKsPaSStE28VU2HBNj5K2p7NV3GcmYZKTxdIKQ/O/Bw K3cY4OOnlrIJS/j6Kq3D4sOWmGxlxjlm2LrXmFzjrFdO+gyOmcmmEaycTOXBeyPgaEpH gmNaY+3Y8WM5VqDRd1abDFQZ4rvqcy2eLQepZX2uUFs01Rr0IVL3s4rABhZvHqOQ6lmd ev23ENR+5Mcq2J/CZX0Zpp5ZE52Dgxf1M2YqsREz3vgtv5glgoRiZtjtzJpz0gtxuB1z ND/zMJmzivC1I5jF1WmeL4zw8l1JvC5nlisH03i0BfBHd9+j/nkqvYW4qB5a1KgF2h8M Nu2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=22I2PYtMOsA2Um7H45ZE48RpuIhSc6M+BF9XYocrVvc=; b=PR0wey18qKG9kdoq8O5x8CLoBl5BnnNwXWY1bVhYLTdDUn/JojpUoxj6a8adR/e39x m8u6v9jblOAwA6K5d8Z5XTfzzp+fTKe1e09Ip7YpjxA2j0dm5bn1y4ZJMrDTeXdWRMsJ Lt9NvaaecleL8XtLgspWvc8ClxeG3z0VBSCK7pKbtG+egtEhiH16R2vNoNXEkxYPqfeP lV0nQuv1iTo9siDQlrYL7zOR3JLugr2ZzrURh7rDI7nx5qA0atqSvc0tGCxgV9kCwsCI 22ihrSVVQeXJ5kQXC1nkUWYnFqXYBWsbRD7Y5g6mk4KTwp3kQytD2F1eDgv1cqfbTgEt YlRw== X-Gm-Message-State: AMke39nhBDM7bGQzn7v4+VIFgT8cmWjGdan/gxW6P6EcXMUB08YBbcbD3g5UIVT6i5LtGQ== X-Received: by 10.36.236.3 with SMTP id g3mr12091191ith.56.1487441894084; Sat, 18 Feb 2017 10:18:14 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id m6sm6738193ioa.57.2017.02.18.10.18.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 10:18:13 -0800 (PST) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 3/4] NFSv4: Fix the underestimation of delegation XDR space reservation Date: Sat, 18 Feb 2017 13:18:05 -0500 Message-Id: <20170218181806.25712-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170218181806.25712-3-trond.myklebust@primarydata.com> References: <20170218181806.25712-1-trond.myklebust@primarydata.com> <20170218181806.25712-2-trond.myklebust@primarydata.com> <20170218181806.25712-3-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Account for the "space_limit" field in struct open_write_delegation4. Fixes: 2cebf82883f4 ("NFSv4: Fix the underestimate of NFSv4 open request size") Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 62ff0ff19880..7510a0cd93fa 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -169,8 +169,10 @@ static int nfs4_stat_to_errno(int); open_owner_id_maxsz + \ encode_opentype_maxsz + \ encode_claim_null_maxsz) +#define decode_space_limit_maxsz (3) #define decode_ace_maxsz (3 + nfs4_owner_maxsz) #define decode_delegation_maxsz (1 + decode_stateid_maxsz + 1 + \ + decode_space_limit_maxsz + \ decode_ace_maxsz) #define decode_change_info_maxsz (5) #define decode_open_maxsz (op_decode_hdr_maxsz + \