Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp348962pxb; Wed, 14 Apr 2021 17:28:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJfWrYXiv1h3cyw+7IDCFqtu5F2s4I01EwKYpVtHKuDil0161B2A3VahYGMDcG+heXLyOv X-Received: by 2002:aa7:c9cf:: with SMTP id i15mr999338edt.4.1618446493888; Wed, 14 Apr 2021 17:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618446493; cv=none; d=google.com; s=arc-20160816; b=DKIo74qVap/JQXacb1ORj5DvKXuAVp68YL+BFqys+6TZmCY3Gq9ROt0KBjy4lwcSGj wNiPAHy5JSZuvZGp9kCPrwipnWZLZRXOI7h1tMrlvMBGz22R5SVq1npZ1ybSWNaCBwK7 YUIRLb+eg96C38m7Apqu58DhVtvWvAYr4Rw0fVrgM0thPVlPf+oiucvdA4c6b6tEeSPf kBg52GFScVj1r9gx0znWQCtY7P6RqwhGEfHouEqF04pVbKp6DwYkJC2NTZfQ1318wdq8 212AfEevYrOqXFKu/J6Qm15JJlB8vT5vKi8amtBIeChd/WepWY5xDMH9ptbEeHtCuqY4 gQug== 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=y2HsT4fSNmwSHqrrlih7t8Mak8jAdpDRueV2Vz243rk=; b=mu/N5nnnXBMZHZgU+qDWDiJrdmRacZHo+y/TK74LPuHcy9RErNwa2U5pRQ+Gu7/klP o4yTqrR6J/PFn26g7v68lrF0fNixknhvoY64R8suLy17htrNzJqXgOrJbEuDwuJSRxzN HOoopdlT3ihuddlyg8tGEt+jtDIQsPzJio2TYd+W0eQ1WYglg/EyB5mwuYXitTKvMXtq AKQyZiuXVMgx48aoUpty6A7EcoAszPCVcGJFkzcmHuNluKGBJD5IoJjmdnYIN0d1V0Oi YK749/eIgHQwPSv+Uy7soMZhUDC9yHjo8OtW76BcJfEwBgdgW7ck2jnlVRBv6iec3NdZ ja7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ZOw/GJ05"; 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 k7si679681ejr.625.2021.04.14.17.27.39; Wed, 14 Apr 2021 17:28:13 -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="ZOw/GJ05"; 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 S1347092AbhDNNog (ORCPT + 99 others); Wed, 14 Apr 2021 09:44:36 -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 S1351589AbhDNNoT (ORCPT ); Wed, 14 Apr 2021 09:44:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A7F33611F0 for ; Wed, 14 Apr 2021 13:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618407837; bh=TVBBJuVLaph3mqMkHTUHDQCga93LuyNRMUNB+JcsDRY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZOw/GJ05IAaScxQdMZ7KSeQsy9V9yvWCHsZUw0NzYeZfCBiDSaKc2u+hpOsZ479xz UoJW0IFmd4TPP6KjxvMhJBkePUKdpbRZ6G6ZNU50N0WYWNdEMmv/bc7FCasYvU4m5n gQr18DmygW9iJStT914L1hGkN511cs4fa7XHExTAS8WLMnqG9KYtVDWiDqXRTZ0sF9 1MzGyu4kUkBcf0pZqzHvC0DiSwrqQh9PgHLhLutVYd+ovr4dfwvO6tcKL4jmZiK58d ZUrJmiLH8E+6byOEzLViWuWOSsvQDDDnAW14Lxff80aPkR1aBBcfG2zsmR89jbSYOP 4E2wyxrlsBySw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH v2 06/26] NFS: Don't revalidate attributes that are not being asked for Date: Wed, 14 Apr 2021 09:43:33 -0400 Message-Id: <20210414134353.11860-7-trondmy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210414134353.11860-6-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust If the user doesn't set STATX_UID/GID/MODE, then don't care if they are known to be stale. Ditto if we're not being asked for the file size. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 8b2f4a5eaa42..4982bc18ee26 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -857,12 +857,17 @@ int nfs_getattr(struct user_namespace *mnt_userns, const struct path *path, /* Check whether the cached attributes are stale */ do_update |= force_sync || nfs_attribute_cache_expired(inode); cache_validity = READ_ONCE(NFS_I(inode)->cache_validity); - do_update |= cache_validity & - (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_LABEL); + do_update |= cache_validity & NFS_INO_INVALID_CHANGE; if (request_mask & STATX_ATIME) do_update |= cache_validity & NFS_INO_INVALID_ATIME; - if (request_mask & (STATX_CTIME|STATX_MTIME)) - do_update |= cache_validity & NFS_INO_REVAL_PAGECACHE; + if (request_mask & STATX_CTIME) + do_update |= cache_validity & NFS_INO_INVALID_CTIME; + if (request_mask & STATX_MTIME) + do_update |= cache_validity & NFS_INO_INVALID_MTIME; + if (request_mask & STATX_SIZE) + do_update |= cache_validity & NFS_INO_INVALID_SIZE; + if (request_mask & (STATX_UID | STATX_GID | STATX_MODE | STATX_NLINK)) + do_update |= cache_validity & NFS_INO_INVALID_OTHER; if (request_mask & STATX_BLOCKS) do_update |= cache_validity & NFS_INO_INVALID_BLOCKS; if (do_update) { -- 2.30.2