From patchwork Tue Mar 30 00:18:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12171283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36687C433E9 for ; Tue, 30 Mar 2021 00:19:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1219361920 for ; Tue, 30 Mar 2021 00:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230212AbhC3ATP (ORCPT ); Mon, 29 Mar 2021 20:19:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:50396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbhC3ASp (ORCPT ); Mon, 29 Mar 2021 20:18:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F2E460295 for ; Tue, 30 Mar 2021 00:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617063525; bh=vVssDi5vxdg/ckVG4mCug4s3T504yxY8NzjKMtj1ElA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FQA5jp98TsaWXcgBt+QKXLjahJu7MEDgI+1uZD9CyO5nLIXrxfENjZpBnRphvRSGV GNnTJctwU/11Sxp8yU6Q9+x40QFC5V1vnLmx1EPyKZuaJY7HlOJjsvvWf01XrnxWtc IbYSC9tFOwGXZhshsga4JDTBkEWNzhXlEzN8hKx4Mdx+5FP6kLMiaE5HpeuhhY55Q/ GjtDah1kCy9sjWlhS3+ya0grRwFtVFnBfyGewrC84ZMZZ85DNssiVtbCLkvJCkvKRr yVVpzVFx4w89c0lRn/jM7nAaDVUWEK7u+UR3SF1OX+XI5rEqpBnwR1sXgQvNxnCOT0 D22WGD6hFg7sA== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH 12/17] NFS: Fix up handling of outstanding layoutcommit in nfs_update_inode() Date: Mon, 29 Mar 2021 20:18:30 -0400 Message-Id: <20210330001835.41914-13-trondmy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210330001835.41914-12-trondmy@kernel.org> References: <20210330001835.41914-1-trondmy@kernel.org> <20210330001835.41914-2-trondmy@kernel.org> <20210330001835.41914-3-trondmy@kernel.org> <20210330001835.41914-4-trondmy@kernel.org> <20210330001835.41914-5-trondmy@kernel.org> <20210330001835.41914-6-trondmy@kernel.org> <20210330001835.41914-7-trondmy@kernel.org> <20210330001835.41914-8-trondmy@kernel.org> <20210330001835.41914-9-trondmy@kernel.org> <20210330001835.41914-10-trondmy@kernel.org> <20210330001835.41914-11-trondmy@kernel.org> <20210330001835.41914-12-trondmy@kernel.org> MIME-Version: 1.0 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 c9386981d210..e57cd490bc4d 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1939,7 +1939,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; }