From patchwork Thu Dec 1 22:06:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9457125 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 F277960515 for ; Thu, 1 Dec 2016 22:06:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4C7328540 for ; Thu, 1 Dec 2016 22:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA11128543; Thu, 1 Dec 2016 22:06:41 +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 8F7F128540 for ; Thu, 1 Dec 2016 22:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757510AbcLAWGj (ORCPT ); Thu, 1 Dec 2016 17:06:39 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:34118 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbcLAWGh (ORCPT ); Thu, 1 Dec 2016 17:06:37 -0500 Received: by mail-io0-f193.google.com with SMTP id r94so3851382ioe.1 for ; Thu, 01 Dec 2016 14:06:37 -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=mx//jTaXU9ZCmRmfZ+dWBzuYNb5w2XTHnXkNYpWP5qs=; b=CS2zdHzj30DWW0xsyGtkezLmNnw1IHY4P50jGkm5ZXAAHh8woYmsQ5kgsEKw7O8zvj X+RgTf0FuluniYzUwBD+0A6ZfSV0R1a/hr/PfL3Lb3aJCjtNM4S0M5LhxlOXDIPJXo8+ dRosVHK+1bw/OPo94xO+G80Zfm1dWac2qZ+qZg1x6X2HTJaO6/4EgkHz4fRgh3BcKuiM 0SV2g47QAVdFbfOTB0NioB8egBXtGlbvPsc7reo5nwg/guQkKqx9fpB5u4iPA4yUBV9I miWdJ9TLO/FZCF0kfTgcoHL8BknDFcSbeWD0mxJF3kq34uMaHqosXqTytSUM/43aAzcm Wa4A== 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=mx//jTaXU9ZCmRmfZ+dWBzuYNb5w2XTHnXkNYpWP5qs=; b=B0kuUdJchiEm9ZuHf3Nt7WEHL5jdab5UP3GBISfSu/iuN0f6bAUFfBNfOr+HHuwPHW JH+c4Z6P8KCyaG/ypoQVuSqnJAYsXtGNsUHN2tE2vryQIovYDLR+KXhU/7TLQ9uvVOTY qSlrYjFVGJBilRA3J8CBX9VFeNwJriHc3+uBQEHLTJeJbdokLwRKv4TneoYeotIK5I+o 9wSYqEUO7H0e4EfTQth0G15gVWG6UKrmI9ja0iY3wFGezG+qrfmcsZEnzE7EjT97TqP8 PDQbfj3WTMXt0gXFovW4TxJQA0Kq0d2vPNHw2M+cbo8tT9hrcAME2Atnly3LKcvpO1U2 HabQ== X-Gm-Message-State: AKaTC0152sc1FpcuJxYH5z6PCD9iKGMRtz8axAJG4B4QQExATBI8QuMtT9WCLDwK5AVBhQ== X-Received: by 10.107.171.4 with SMTP id u4mr33572794ioe.102.1480629996720; Thu, 01 Dec 2016 14:06:36 -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 g70sm955812ioj.4.2016.12.01.14.06.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 14:06:36 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 3/5] NFSv4: Don't request a GETATTR on open_downgrade. Date: Thu, 1 Dec 2016 17:06:30 -0500 Message-Id: <20161201220632.12754-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161201220632.12754-3-trond.myklebust@primarydata.com> References: <20161201220632.12754-1-trond.myklebust@primarydata.com> <20161201220632.12754-2-trond.myklebust@primarydata.com> <20161201220632.12754-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 If we're not closing the file completely, there is no need to request close-to-open attributes. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index fc89e5ed07ee..c37473721230 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -499,14 +499,12 @@ static int nfs4_stat_to_errno(int); (compound_encode_hdr_maxsz + \ encode_sequence_maxsz + \ encode_putfh_maxsz + \ - encode_open_downgrade_maxsz + \ - encode_getattr_maxsz) + encode_open_downgrade_maxsz) #define NFS4_dec_open_downgrade_sz \ (compound_decode_hdr_maxsz + \ decode_sequence_maxsz + \ decode_putfh_maxsz + \ - decode_open_downgrade_maxsz + \ - decode_getattr_maxsz) + decode_open_downgrade_maxsz) #define NFS4_enc_close_sz (compound_encode_hdr_maxsz + \ encode_sequence_maxsz + \ encode_putfh_maxsz + \ @@ -2328,7 +2326,6 @@ static void nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, encode_sequence(xdr, &args->seq_args, &hdr); encode_putfh(xdr, args->fh, &hdr); encode_open_downgrade(xdr, args, &hdr); - encode_getfattr(xdr, args->bitmask, &hdr); encode_nops(&hdr); } @@ -6115,9 +6112,6 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, if (status) goto out; status = decode_open_downgrade(xdr, res); - if (status != 0) - goto out; - decode_getfattr(xdr, res->fattr, res->server); out: return status; }