From patchwork Sat Feb 18 19:12:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581189 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 A37F66049F for ; Sat, 18 Feb 2017 19:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95CF1286AE for ; Sat, 18 Feb 2017 19:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AB8B286DB; Sat, 18 Feb 2017 19:12:56 +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 4BC58286AE for ; Sat, 18 Feb 2017 19:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753810AbdBRTMy (ORCPT ); Sat, 18 Feb 2017 14:12:54 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:34671 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753550AbdBRTMy (ORCPT ); Sat, 18 Feb 2017 14:12:54 -0500 Received: by mail-it0-f65.google.com with SMTP id r141so6836570ita.1 for ; Sat, 18 Feb 2017 11:12:53 -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=JcC71w4wOQ5A66nHKkxCXewwKdXKNOu7D6Rn+ZIiRixSGLZWqGciy7nyri1g4MwAQT XmATKx0jn3RoBwPn1+7rGUTIALneU7j9wKvrQYPDTlsGyLDkMCu1Bph56tc+cyYMZ6go hk2PFbC8k7NfE2cuUk4rPYimDjUa2+IlpIklhJ49QBOBnCE/oxyaLWlUKaQLgzLKgaoE KiDuxx/0O7fwpLSBGt0OTPO+sAZHZdUyz5gWpiJTCsKO/krwP2QqZdC2iZppQhtgFmm0 2NFk1TVFbpoaBt+dbo2gek2R/ntlicvWwJtrg0U/Fad93IKOsS+WmxcE/cWqMDQ3XNvn g93w== 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=e0TMRvl3IY/Uuw6UmA/MhONzONMNNecxiRfoFr1vOLh4e+rq/aS3Mt+Yg+WHWBbLCV LVoDYW/9oU0uIHblkvHtu670NOYjd1XvJjFjA+kG2hH0JL1X5sSf3Ez7b0TDktFLlxT3 i+2DzFiZD0YGxAdWSfKQIn7hUwL+cs3xJyNcUskr0zJT6kQgP0qGN4pkBZ4LNCsZ6Jym zBSxjKazJSzCYQ2l6vbUWDGw3thwu71S27cymy1xgwbevncbkNFxvfTzmoEQXuXSd5Tn OuK+cYFL1CieVcpRrqvFwUl+ndruKiy70RNhhui2B7JYS8wYhOmtDytzjkMp2B7uWRmf /l4w== X-Gm-Message-State: AMke39nbTN6vid7rrVp+CAIhZb2hVmglG26LHggeoXYdt7ICCM5sevifpLzf6d8FBcIQNg== X-Received: by 10.36.95.134 with SMTP id r128mr11497516itb.15.1487445173236; Sat, 18 Feb 2017 11:12:53 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id 35sm6823174ior.50.2017.02.18.11.12.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 11:12:52 -0800 (PST) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 3/4] NFSv4: Fix the underestimation of delegation XDR space reservation Date: Sat, 18 Feb 2017 14:12:45 -0500 Message-Id: <20170218191246.32687-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170218191246.32687-3-trond.myklebust@primarydata.com> References: <20170218191246.32687-1-trond.myklebust@primarydata.com> <20170218191246.32687-2-trond.myklebust@primarydata.com> <20170218191246.32687-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 + \