Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp48909pxb; Wed, 14 Apr 2021 09:09:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi0aHCfjp0prhK2zAKSn1JiPvzy3OBqSHROonFM5KlzkWDFAx+Q6fFbGFKDgbflGa2a9BN X-Received: by 2002:a17:90b:2242:: with SMTP id hk2mr4587137pjb.4.1618416550450; Wed, 14 Apr 2021 09:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618416550; cv=none; d=google.com; s=arc-20160816; b=MjlNN7J44hMsrIImGty2R95D3RoIztEH63kF96TIReP8J7inKKh0NAivNfoYtiveJF vCwmAZ8omcyEAtl8NFn3RFDKSwQz13YVSPIYFux4SwtXTyJmUgj1yTH5fA4XJ9oVtcTo RpHDQtAJMt5YqWA65WP+iYpDUootr4FymdyQPGIco0kiSvtc/twZ7htvsbZX/BtjIRzO zdGGqi7gwQiTM89LafBA5nw+Dj2v9F0M9y4WlYVjXPtbU5cfF3FnGwQLQ54RuDU9HzXR G0tbDKmPDn2k3ESNhNFulQJOTiYO9WN22LR9gbxXyAar8K3uB6aIj96KencC+ntsuAfE LjMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=q62g89V5TXr2jT5vMB2tx5cDsDoSbHwkeE0aNhjFPLI=; b=FWmhu5tVdZcYnl2CBNgz5xhKWDT/cZV84R3aEHSZ/DDRDVZlua/AMXyAb509FvLWIK DfRFKhan1LCbLTooGTrMrTM63zbB6ZDz8utQkGOhRbnPAYUqzzU3IN30dXOru2HLj48V IMUMbGK6uR/R6KINawKmoLHdlWIMGxIW5gcffXaRBkw5BlTYKDvsoYX+Fk2rlw0a7X9o hiDTUb2ahu9vuVrte/JYlzBhiDKfjmWMcKtKN2bHr5WK3yI8iruefmIxJghq4FU8eVlr NjRP+POLtCMgahkWeERunzE2SFqIxrqMNR301pe5eylLhxVcP3hEO8wHTUsEejM8FSwq w5ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fb+s38p3; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r12si1892977pgv.467.2021.04.14.09.08.56; Wed, 14 Apr 2021 09:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fb+s38p3; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351574AbhDNNoi (ORCPT + 99 others); Wed, 14 Apr 2021 09:44:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:52156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351607AbhDNNoX (ORCPT ); Wed, 14 Apr 2021 09:44:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FF34611CC for ; Wed, 14 Apr 2021 13:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618407841; bh=XA96E3yetjCfwmoZqOjRxO7wvK+Th6Drpffd8XFm6sc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fb+s38p3Y0n6X433oLULMzkrV+D8sM3IQ6d82v0WvmT29gOTvkpZ+vJNAIg5MkttH kG2UD5t7HuzA3BCH1ALPv6sQ/VQwpGBK0kjLoYPzABJDT+r0wX8czfJ7uxKreNtJgR JTaW4YH/mgZM2XMoFZeXs7M5+9ulzvrpdvlY0RrMnP6/obvpPdNQSu63TnDT38j590 p/Rf4K3mXD4Dsu6gpl5M3aQ1khiEVWDxy7oK3D8MnlqWGHImwAI2j5oDeBScVtl2cO CRJd8WoS6yWaBe60/H2YkWjmw1XCZMRYMP0yJOcjHldD4Do9RpMSuJOnILpwa4vniX G3HxhBMy9LViw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH v2 15/26] NFS: Fix up handling of outstanding layoutcommit in nfs_update_inode() Date: Wed, 14 Apr 2021 09:43:42 -0400 Message-Id: <20210414134353.11860-16-trondmy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210414134353.11860-15-trondmy@kernel.org> References: <20210414134353.11860-1-trondmy@kernel.org> <20210414134353.11860-2-trondmy@kernel.org> <20210414134353.11860-3-trondmy@kernel.org> <20210414134353.11860-4-trondmy@kernel.org> <20210414134353.11860-5-trondmy@kernel.org> <20210414134353.11860-6-trondmy@kernel.org> <20210414134353.11860-7-trondmy@kernel.org> <20210414134353.11860-8-trondmy@kernel.org> <20210414134353.11860-9-trondmy@kernel.org> <20210414134353.11860-10-trondmy@kernel.org> <20210414134353.11860-11-trondmy@kernel.org> <20210414134353.11860-12-trondmy@kernel.org> <20210414134353.11860-13-trondmy@kernel.org> <20210414134353.11860-14-trondmy@kernel.org> <20210414134353.11860-15-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust If there is an outstanding layoutcommit, then the list of attributes whose values are expected to change is not the full set. So let's be explicit about the full list. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 81e3e140e923..18c7277d17a8 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1933,7 +1933,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) nfs_wcc_update_inode(inode, fattr); if (pnfs_layoutcommit_outstanding(inode)) { - nfsi->cache_validity |= save_cache_validity & NFS_INO_INVALID_ATTR; + nfsi->cache_validity |= + save_cache_validity & + (NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_CTIME | + NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE | + NFS_INO_REVAL_FORCED); cache_revalidated = false; } -- 2.30.2