From patchwork Thu Dec 1 22:19:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9457183 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 C57E660756 for ; Thu, 1 Dec 2016 22:19:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B860F28540 for ; Thu, 1 Dec 2016 22:19:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD6F028542; Thu, 1 Dec 2016 22:19:44 +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 70A6228540 for ; Thu, 1 Dec 2016 22:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759903AbcLAWTm (ORCPT ); Thu, 1 Dec 2016 17:19:42 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:35099 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759814AbcLAWTj (ORCPT ); Thu, 1 Dec 2016 17:19:39 -0500 Received: by mail-io0-f194.google.com with SMTP id h133so4681125ioe.2 for ; Thu, 01 Dec 2016 14:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Rv4jZItBibQTfshF86IlZz8c+YGVhaeCSWzOAYsmzak=; b=ZlWsg4ITZD/y854/+cc8fKPYI2xt2y+wG3TpK0XCAIdoOC2aTqa0nLW+h53y8vnmkw QKuhGtbgqO2B/colojjxxXZxgSrDSU79E5NODe6PF5msZL4qoiJ06zl481uhfBAp7P1g Exy+mAhsO3ngtLQhgDnJ6GUDH1d0CHxu2kOo9OdtgtbNwHikSPxBvuI9Asy6N4N2fUut tRnC/y42LZ2BJEemOIT471nmLKnC9unRJrSygwPQtoH6biwUhPm5A9Ca/kGM0f7syJSz t4ML5Syf8uvSIcTzw1+viS/Yi98KAv/LDiFn0BaU78aA2Jf9mHICOtp+OGBEGBu43vTx cdGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Rv4jZItBibQTfshF86IlZz8c+YGVhaeCSWzOAYsmzak=; b=Jqz3qgG2DKL2xfMXBwfgB+VlMuygLUMqWsgOpBoWv/EM13e4K3/0dyv5p+MOrvL/ta l3ARB3A4nLBEToEffz8xr6TTent6eMUgdukogebkkteJ4NNTbCGaJIdHgWZVsJICCYu5 1fyuiWMXUY5rJNbchRisH8OlnLy0RJL2gxBiwds2q/ohUs4U5xtqDqUKjllNTxSMIVVC 75/WihUeyu0NzFoxtp5ZLdGB7FbxX8M6lUBhMc8UK8lRHbUNI+wuu7jM9Sxgn9NGTz/A PGatMOUv/6myYZs9kmdv1lOEuqxr6n1fRHM9uzIRvRllVc86u6SjJVnqCaGMa47regQe dPtw== X-Gm-Message-State: AKaTC00JU6W7RegUh23VAaisXmvvxf1s6248U4ZXScRMxj/xoWyYqG7ALD+AWtdgnesIPA== X-Received: by 10.36.33.151 with SMTP id e145mr48229ita.14.1480630779209; Thu, 01 Dec 2016 14:19:39 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id t20sm6532ita.7.2016.12.01.14.19.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 14:19:38 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 15/26] NFSv4: Fix missing operation accounting in NFS4_dec_delegreturn_sz Date: Thu, 1 Dec 2016 17:19:11 -0500 Message-Id: <20161201221922.15657-16-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161201221922.15657-15-trond.myklebust@primarydata.com> References: <20161201221922.15657-1-trond.myklebust@primarydata.com> <20161201221922.15657-2-trond.myklebust@primarydata.com> <20161201221922.15657-3-trond.myklebust@primarydata.com> <20161201221922.15657-4-trond.myklebust@primarydata.com> <20161201221922.15657-5-trond.myklebust@primarydata.com> <20161201221922.15657-6-trond.myklebust@primarydata.com> <20161201221922.15657-7-trond.myklebust@primarydata.com> <20161201221922.15657-8-trond.myklebust@primarydata.com> <20161201221922.15657-9-trond.myklebust@primarydata.com> <20161201221922.15657-10-trond.myklebust@primarydata.com> <20161201221922.15657-11-trond.myklebust@primarydata.com> <20161201221922.15657-12-trond.myklebust@primarydata.com> <20161201221922.15657-13-trond.myklebust@primarydata.com> <20161201221922.15657-14-trond.myklebust@primarydata.com> <20161201221922.15657-15-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 We need to account for the reply to the PUTFH operation in the DELEGRETURN compound. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 86f72ae605c8..0a82b3fb2d27 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -710,6 +710,7 @@ static int nfs4_stat_to_errno(int); encode_getattr_maxsz) #define NFS4_dec_delegreturn_sz (compound_decode_hdr_maxsz + \ decode_sequence_maxsz + \ + decode_putfh_maxsz + \ decode_delegreturn_maxsz + \ decode_getattr_maxsz) #define NFS4_enc_getacl_sz (compound_encode_hdr_maxsz + \