From patchwork Mon Nov 14 20:55:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9428383 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 4EA026047D for ; Mon, 14 Nov 2016 20:55:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A03328A66 for ; Mon, 14 Nov 2016 20:55:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F32128AE0; Mon, 14 Nov 2016 20:55:48 +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 DDEAB28A66 for ; Mon, 14 Nov 2016 20:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934799AbcKNUzr (ORCPT ); Mon, 14 Nov 2016 15:55:47 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:36006 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932755AbcKNUzq (ORCPT ); Mon, 14 Nov 2016 15:55:46 -0500 Received: by mail-it0-f66.google.com with SMTP id n68so16737789itn.3 for ; Mon, 14 Nov 2016 12:55:45 -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=S8IFWPi81src3g82YQDtWCvr4/Bn9eoWqJpESIZY3X8=; b=qGWpftN8uPwB1FR5apF7ysmQw8KPHd7/yp29744EhlkG3adnZGrsdQB39zdXLwbhvR JKRJskTKepnb0EMmVz/xehGBM1oHwlnZ8B643rdQu41aIMhOHhIX3kxrLcveU4jb4pxX EyRlIMzPpvwBBvqPwsvom0DoUu/aA6Norb/qi0WwlHNxEPGu9o5dlNJkIDKAC2763a6S +xnbCAShPskTCajsxNc76y/exc6/oY7TvLrkRJEcORCvX2abwBuWklMjRcrZz0pMwgqw kX+bOEah1zA3IDmMSHQnjJMEMH1EKxaZQOaBFWEOwUu3wW2c9wrYvMAbRDt2vLGddoTN 3sfQ== 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=S8IFWPi81src3g82YQDtWCvr4/Bn9eoWqJpESIZY3X8=; b=PMjjYChXeZAjPnrs7UZjM/j6d03vksmY9w643Q3II4UJ8MgwaQRSm06n36RCOjUjtt hyWavFsK9847eRcHz+e3vArBbSOmd7IjOi9tsn31WcuXZNqq7/kEiNBUPj2NqwzNyp/s nN8UhM1vV1O515IOT20xLc23EuXdCvHhSekgJPh3DGbzDrAV29Ed8aB3npT2Tp6pEGbt 78K4hda1aMv1pExTfmTEqZyJD1iMeh9FMpwwSvRw5dyVpU98qPYcsWvDUpBpFTy5CzF/ vi7pe2AVX/kx3c54vMgwM+vjPNlQC3Jqt/CXQgTCyPou3VvZkOgme6aclJ66uJ4peXC6 hpOg== X-Gm-Message-State: ABUngvejTI2qpBEpsjDNcBCLY/QgOIq2u9t6L1Ah2N9dK0W0E1dOVPDtqfLCgmCTOHnKcA== X-Received: by 10.36.68.146 with SMTP id o140mr241867ita.33.1479156945234; Mon, 14 Nov 2016 12:55:45 -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 o19sm118035ito.16.2016.11.14.12.55.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 12:55:44 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 4/5] NFSv4: Don't request close-to-open attribute when holding a delegation Date: Mon, 14 Nov 2016 15:55:34 -0500 Message-Id: <1479156935-34479-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479156935-34479-4-git-send-email-trond.myklebust@primarydata.com> References: <1479156935-34479-1-git-send-email-trond.myklebust@primarydata.com> <1479156935-34479-2-git-send-email-trond.myklebust@primarydata.com> <1479156935-34479-3-git-send-email-trond.myklebust@primarydata.com> <1479156935-34479-4-git-send-email-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 holding a delegation, we do not need to ask the server to return close-to-open cache consistency attributes as part of the CLOSE compound. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 10 ++++++++-- fs/nfs/nfs4xdr.c | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1897591689f6..a21b3cb87453 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3144,8 +3144,15 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) goto out_wait; } - if (calldata->arg.fmode == 0) + if (calldata->arg.fmode == 0) { task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE]; + + /* Close-to-open cache consistency revalidation */ + if (!nfs4_have_delegation(inode, FMODE_READ)) + calldata->arg.bitmask = NFS_SERVER(inode)->cache_consistency_bitmask; + else + calldata->arg.bitmask = NULL; + } if (calldata->roc) pnfs_roc_get_barrier(inode, &calldata->roc_barrier); @@ -3228,7 +3235,6 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait) if (IS_ERR(calldata->arg.seqid)) goto out_free_calldata; calldata->arg.fmode = 0; - calldata->arg.bitmask = server->cache_consistency_bitmask; calldata->res.fattr = &calldata->fattr; calldata->res.seqid = calldata->arg.seqid; calldata->res.server = server; diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 43cc989b5c06..a8bebb52df78 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -2250,7 +2250,8 @@ static void nfs4_xdr_enc_close(struct rpc_rqst *req, struct xdr_stream *xdr, encode_sequence(xdr, &args->seq_args, &hdr); encode_putfh(xdr, args->fh, &hdr); encode_close(xdr, args, &hdr); - encode_getfattr(xdr, args->bitmask, &hdr); + if (args->bitmask != NULL) + encode_getfattr(xdr, args->bitmask, &hdr); encode_nops(&hdr); }