From patchwork Thu Dec 1 22:06:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9457127 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 2D43860756 for ; Thu, 1 Dec 2016 22:06:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F88928540 for ; Thu, 1 Dec 2016 22:06:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14A3F28542; Thu, 1 Dec 2016 22:06:42 +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 BA92028541 for ; Thu, 1 Dec 2016 22:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752078AbcLAWGk (ORCPT ); Thu, 1 Dec 2016 17:06:40 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:35464 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757426AbcLAWGi (ORCPT ); Thu, 1 Dec 2016 17:06:38 -0500 Received: by mail-io0-f194.google.com with SMTP id h133so4614649ioe.2 for ; Thu, 01 Dec 2016 14:06:38 -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=WbJagF1akGVdPpNTrlosJqj6t99rapZABdgWCqZtFFM=; b=lzsrJrE+9fImg12fYzOljdhDGGDpKAJtmxQdhsxkAvgrk0iO2R9izA5vsNdxKqjtqV QpzMKRsf7SrXoCDVfivRXNLJSS4kT/MkGKldgACSyABqmsmBRAJPnqES63rJdz6NaWVZ aXXIhsY2INrZXpWdwnDApqXX2hZHgyQ94nzVA53jvCF6cekhnwHT3zcF5iEJcXGBP6aO NYObe0BJGnzButHiNHtjaU0MocdINA4pVhV7ao0ECJkpVUnktpDxs3A2eRUIVTJrtsxJ mgmJ03bKAuXbeaouhHKBDTQrmNabnZVhg9dW74EYPFu2E4w4fy8yPGqJ5/wDTPi7jSX6 wAEA== 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=WbJagF1akGVdPpNTrlosJqj6t99rapZABdgWCqZtFFM=; b=QrVwjqrm4Mbu0BM+G1hi9j4T+u2q8AHGYuCZQXbhyR+cTKKInBUHgrdEKTQV64vLUR NiQpJBHmeI44qDCvGixYaT9J4mi+hJsorU8L7Fy4zdzt9qm1GQIMILwVNIjgBGQafxJP JS10XGInpuEeqE759FS+TxeE+ay60gQcUf/iYbOvjhDxVE62ssICbvWjDLo9pzvwO5Ak kv1OFurlM0gV/i3YxQL6EGPiVkqK0DVvYWv4uHmYE87QYtlL5BoDem2UN9p2afScAil8 9uQ2WIrNKQVkOHMyJ5i2+usCW0RjJNSX1sTSgjNP04hgeu/eu5/wiCTyZlFGv1pg3C9f t3yA== X-Gm-Message-State: AKaTC02GGULAvglepEpMBZTiiRjX0WOA1+/rRNp7Q6Chyv7Qs7ih+Sj1vvdrEI8wgopxog== X-Received: by 10.107.15.232 with SMTP id 101mr33677678iop.218.1480629997924; Thu, 01 Dec 2016 14:06:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 14:06:37 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 4/5] NFSv4: Don't request close-to-open attribute when holding a delegation Date: Thu, 1 Dec 2016 17:06:31 -0500 Message-Id: <20161201220632.12754-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161201220632.12754-4-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> <20161201220632.12754-4-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 c0628f78ed98..917a6db5c84f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3156,8 +3156,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); @@ -3240,7 +3247,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 c37473721230..b54931503872 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -2248,7 +2248,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); }