From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 D8D3BC4360C for ; Wed, 12 May 2021 19:57:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1BB16142C for ; Wed, 12 May 2021 19:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343789AbhELT6r (ORCPT ); Wed, 12 May 2021 15:58:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:50262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352073AbhELSC3 (ORCPT ); Wed, 12 May 2021 14:02:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 097F86142C; Wed, 12 May 2021 18:01:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620842480; bh=qwoYgyRCT7R8e2KUDxnrGQ3wOCWfQODJ49rpHCBVy6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oNejDGZsu3+GFH1CViWzer8B2kSWrj/DmWvCAcfqcVXrjLp8eIXhluNBJ3kqdqwjy ofifcjY/ayHvd4U/Wynxch3D8ELKyEEyvgm7XXSBM8EYOhDSFLfoLG3ga0V3MnfdsL lGBrHBzy/wz8GyT1LnyiKTNoiVgKjlqUjppKrw7mraczhKHGh+D1Q6zn5b2NGCtlq8 EOKvz+5kc1jMRGaVqdhVBHdphLIJTzMLnvvN0HFF/3MQGxb1uqxbfp5qIQkfs15Odl RYbbs05AERT7M2yXelBI8XBrASGik9tWdv9h3FDMaRGGGEyixS8/pp1G6FAZH/CBtf cEoNU8Fch7F2A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 11/37] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid Date: Wed, 12 May 2021 14:00:38 -0400 Message-Id: <20210512180104.664121-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210512180104.664121-1-sashal@kernel.org> References: <20210512180104.664121-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust [ Upstream commit 50c7a7994dd20af56e4d47e90af10bab71b71001 ] When we're looking to revalidate the page cache, we should just ensure that we mark the change attribute invalid. Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index ff737be559dc..97cce24f5085 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -219,7 +219,8 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags) | NFS_INO_INVALID_SIZE | NFS_INO_REVAL_PAGECACHE | NFS_INO_INVALID_XATTR); - } + } else if (flags & NFS_INO_REVAL_PAGECACHE) + flags |= NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE; if (!nfs_has_xattr_cache(nfsi)) flags &= ~NFS_INO_INVALID_XATTR; -- 2.30.2