Message ID | 20231004185347.80880-58-jlayton@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp342480vqb; Wed, 4 Oct 2023 12:01:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgSx9N283xYXeAE/TbKFEsHDxGvnyZ3W7EqQjsiRF+ze9y9kHAJ8p/ToXyqQuM2i6lTO3s X-Received: by 2002:a05:6a20:42a0:b0:14b:3681:567e with SMTP id o32-20020a056a2042a000b0014b3681567emr3758139pzj.29.1696446067608; Wed, 04 Oct 2023 12:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696446067; cv=none; d=google.com; s=arc-20160816; b=wj/VK3/4ZGpUvPUWDnN6eEf8+lNKXhyl7kSmLufYXdsUoku8TW3Jr+lL5lX+glcLG2 1vaI7rLwNAuNneYb/5J4GvyDQd59Z3T0M3CzYnNycOYCc7/7p6srjx/y+KhMDoOo8ZR2 4sXnlRRnmqkWdQgQaSlomiGBJ9RIHQSwAeET+9NLgI8HMpgA9bTDkMRcY8uGImXaQdaB 5KdjT7CElXUZ8rBpyr0toqCV79PxFFUSBRSF5w9KqUZU62dfxXROTDs6ftURjhdWzYeR CI3W3llhR5ue0zGaUZzNrW86uhgu8C8BZXVaqBPeJmD1kKc76fxd3EllMOdkyQ9yMDVO bFSA== 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:cc:to:from :dkim-signature; bh=+/N8UXlHRWGYYErWAxvC5D7YcJz+RC+gblxgBg19Pis=; fh=1ts8YaBpHdhauL1JhLd3+yfDH4+ZNqI6GN/ugCTFmCg=; b=lWD+m1WAPe2R8drmAIyPrdpGhFfwwcnc44uaUDMy/tfrBBBRVLvUEbFKKffE/gV258 U7+T6ITD1bd8V18AEQ9IhOvjkX31MswMu9EsNnj07XoP1Z21NLnY15uoloSai/gxTx5b i/FAKjaT0/5UxgRzNNhT3j6bQaqRTANwC3k+eYlUlNLicmVXi9lLmJZJ/EhP7kDyPrL6 jWHVt5SLdgpVgkLtaxeprERWqbYc7OWJGBYWwtVE9g7F9VxdRFtInWqXboHh/ADjhczr LkqYFWpuhzw+G22t6NN/FHUgapBKcAaN3sWQlI++9bZaw5Zm/qk3FSJgJLn7n3UlLbek jFsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hWYms5tB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id g28-20020a63565c000000b0056a1ea34f45si4221817pgm.670.2023.10.04.12.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 12:01:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hWYms5tB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 6C5988068970; Wed, 4 Oct 2023 12:00:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245108AbjJDS6b (ORCPT <rfc822;ezelljr.billy@gmail.com> + 19 others); Wed, 4 Oct 2023 14:58:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245094AbjJDS43 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 4 Oct 2023 14:56:29 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6AF31988; Wed, 4 Oct 2023 11:54:58 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09775C4166B; Wed, 4 Oct 2023 18:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696445698; bh=YMmryZmmNEItRm2e+RTUeAshmJNZg8hKfFS2ryfvqkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hWYms5tBg7anp0uW84zt4o+EXEhIMFJDachX7wmqUsqsl24Yxew0DEMfDQSf22Sue 9YSh7c632k6ZCA3mQqeCsf6O8gNH2s/rskd6dpZRUB8kCGUW223XotwbsA4YKtUzj4 dJhwGAZi58NRfYKQWpqFUBccPn3Shz8urlrISuovGklJA62gHCWkcT6knYlVPJhNUy 1EcET826gGXKwkG0pTwZqse/ssgLNpzBakDb6em5V8mpF7nlDu8/WVZO0IKT2SZjYh b5kL47oWXd1dDNWv/jeQSOp9j7v6jMjRB9kSQTwc0WSUdq6/KwLcYxcUYEJf/oglBw kVEWbnnZVaj2A== From: Jeff Layton <jlayton@kernel.org> To: Alexander Viro <viro@zeniv.linux.org.uk>, Christian Brauner <brauner@kernel.org>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-unionfs@vger.kernel.org Subject: [PATCH v2 60/89] overlayfs: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:45 -0400 Message-ID: <20231004185347.80880-58-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org> References: <20231004185221.80802-1-jlayton@kernel.org> <20231004185347.80880-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 04 Oct 2023 12:00:12 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852631862881710 X-GMAIL-MSGID: 1778852631862881710 |
Series |
fs: new accessor methods for inode atime and mtime
|
|
Commit Message
Jeff Layton
Oct. 4, 2023, 6:52 p.m. UTC
Convert to using the new inode timestamp accessor functions.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/overlayfs/file.c | 9 ++++++---
fs/overlayfs/inode.c | 3 ++-
fs/overlayfs/util.c | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index acdd79dd4bfa..131621daeb13 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -250,6 +250,7 @@ static void ovl_file_accessed(struct file *file) { struct inode *inode, *upperinode; struct timespec64 ctime, uctime; + struct timespec64 mtime, umtime; if (file->f_flags & O_NOATIME) return; @@ -262,9 +263,11 @@ static void ovl_file_accessed(struct file *file) ctime = inode_get_ctime(inode); uctime = inode_get_ctime(upperinode); - if ((!timespec64_equal(&inode->i_mtime, &upperinode->i_mtime) || - !timespec64_equal(&ctime, &uctime))) { - inode->i_mtime = upperinode->i_mtime; + mtime = inode_get_mtime(inode); + umtime = inode_get_mtime(upperinode); + if ((!timespec64_equal(&mtime, &umtime)) || + !timespec64_equal(&ctime, &uctime)) { + inode_set_mtime_to_ts(inode, inode_get_mtime(upperinode)); inode_set_ctime_to_ts(inode, uctime); } diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 8adc27e5e451..345b8f161ca4 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -579,7 +579,8 @@ int ovl_update_time(struct inode *inode, int flags) if (upperpath.dentry) { touch_atime(&upperpath); - inode->i_atime = d_inode(upperpath.dentry)->i_atime; + inode_set_atime_to_ts(inode, + inode_get_atime(d_inode(upperpath.dentry))); } } return 0; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index a44eec80dc82..73ac47b49218 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -1509,8 +1509,8 @@ void ovl_copyattr(struct inode *inode) inode->i_uid = vfsuid_into_kuid(vfsuid); inode->i_gid = vfsgid_into_kgid(vfsgid); inode->i_mode = realinode->i_mode; - inode->i_atime = realinode->i_atime; - inode->i_mtime = realinode->i_mtime; + inode_set_atime_to_ts(inode, inode_get_atime(realinode)); + inode_set_mtime_to_ts(inode, inode_get_mtime(realinode)); inode_set_ctime_to_ts(inode, inode_get_ctime(realinode)); i_size_write(inode, i_size_read(realinode)); spin_unlock(&inode->i_lock);