From patchwork Wed Jun 21 14:46:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 111098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4437809vqr; Wed, 21 Jun 2023 08:13:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48/uCnEgQJo5UeQAOXsUhWfL7SLCXwPCKLJPoNg7FP0iXo52/VXrsER38MvAApvFzfakF7 X-Received: by 2002:a05:6a00:244a:b0:666:8cbb:6e02 with SMTP id d10-20020a056a00244a00b006668cbb6e02mr19594185pfj.8.1687360382634; Wed, 21 Jun 2023 08:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687360382; cv=none; d=google.com; s=arc-20160816; b=FbMWNj4FzXVrqTqe/qce6Ubzr36PWpNDm5//EWwNWT1lBDmjiX09CA12P22nhOY37x f/gMTrxWTnq1WtTTEEsZ5cKU5MKDi+O1XhyDDKkteoycZHEQoYyeKjgE9LmlWf8uUY1+ vWzqu01xE03GVYGfxpUXiGzzf4QvfSxkI414omH5n9ES3qKqaGz+/hEGXq39bFLc2l4e zLxQvBGkPqE2rdecoFLW+a/HFGZxf+Nt5/D2G9IcO7ZLzLi1zvi7uiDhusbR5j4RVime JErH512SX/1gkV+INDXujpU/PArE/OZZLezDnN/YZoAnTVyoIgimC/orgvpMBnYt5F9b t3Ew== 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=IzN+4TrwDQE/s98IkGnF/yqzbOkikh04UZOGbZuqFzo=; b=rIvmMBY2Def7vhYImxqEYd7Swkm7KbcoFV7YqeqlFIeQPQbGtLvEhmVLv7+o7TY7y9 q2GABlEbKtBkV0F8Si+QyOcQtNal2eW+styFqlsnEMILYu5bq8dqJf/X+PEjqtYNB+Sw XqPzSTJfKqwA7hiU3gZF5+BoIvUSy5+Ri12X6d7GhmiUDp6SwVyQkwrGoEs7O3JVL7Ey Mi3kOkgKFVe9HAN22NeSN46HES2YIfUmkb2aKQNlVo6jRv0kEaSJcWUqvXFk/Ahw19Kp mCoDLVeVjRmUzkTFyriTyx4Q+7TNDdlF9QshKg49gFbXhfQd27Cspmzgr0u4ELjXOV1g yDmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IIOagbf4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u2-20020a637902000000b0055387ef9633si1128029pgc.804.2023.06.21.08.12.49; Wed, 21 Jun 2023 08:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IIOagbf4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232624AbjFUOxM (ORCPT + 99 others); Wed, 21 Jun 2023 10:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232592AbjFUOwL (ORCPT ); Wed, 21 Jun 2023 10:52:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35EAE2D7C; Wed, 21 Jun 2023 07:49:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1287B61596; Wed, 21 Jun 2023 14:49:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE600C433C0; Wed, 21 Jun 2023 14:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687358950; bh=YWuokfMJ+4rhgsv839ofdmeql5mHi2OINpoubcGpHfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIOagbf41K//lPF2/RO6T6Q5+Xe/GO1RvWVI/XL+oj89Hlvg040jUCa3I74FwjDJT CJLs5m8r2RvvSFTtMUXujc6DP3fJkU9mQ7h5goH8M+BpBiUO0KBj6G6F0NG5Flio54 jjHv5hY+vES2eZOQPHMcVCpyy8tU035oESGmxyI0xwUfCrP+TicwbpVV8HKL+jHoBG j1u7oE1BpXsHkcZZApRcJ5CuI/3mVRjeXtsvEH7WoOgyjQWDPRtGX/1WOAY6YS1UlI yc8Sb5evqBTN6lIFkgLp3qLOwJpI+Z05vtg61orV6upUy76HSwv3v52zltYxzTIN/S V4ReCo+RuQdNA== From: Jeff Layton To: Christian Brauner , Miklos Szeredi Cc: Al Viro , Jan Kara , linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 54/79] overlayfs: switch to new ctime accessors Date: Wed, 21 Jun 2023 10:46:07 -0400 Message-ID: <20230621144735.55953-53-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230621144735.55953-1-jlayton@kernel.org> References: <20230621144507.55591-1-jlayton@kernel.org> <20230621144735.55953-1-jlayton@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769325600443901278?= X-GMAIL-MSGID: =?utf-8?q?1769325600443901278?= In later patches, we're going to change how the ctime.tv_nsec field is utilized. Switch to using accessor functions instead of raw accesses of inode->i_ctime. Signed-off-by: Jeff Layton Reviewed-by: Amir Goldstein --- fs/overlayfs/file.c | 7 +++++-- fs/overlayfs/util.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 21245b00722a..b47013d4bd4e 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -239,6 +239,7 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence) static void ovl_file_accessed(struct file *file) { struct inode *inode, *upperinode; + struct timespec64 ct, uct; if (file->f_flags & O_NOATIME) return; @@ -249,10 +250,12 @@ static void ovl_file_accessed(struct file *file) if (!upperinode) return; + ct = inode_ctime_peek(inode); + uct = inode_ctime_peek(upperinode); if ((!timespec64_equal(&inode->i_mtime, &upperinode->i_mtime) || - !timespec64_equal(&inode->i_ctime, &upperinode->i_ctime))) { + !timespec64_equal(&ct, &uct))) { inode->i_mtime = upperinode->i_mtime; - inode->i_ctime = upperinode->i_ctime; + inode_ctime_set(inode, uct); } touch_atime(&file->f_path); diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 7ef9e13c404a..e3746f9a202f 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -1202,6 +1202,6 @@ void ovl_copyattr(struct inode *inode) inode->i_mode = realinode->i_mode; inode->i_atime = realinode->i_atime; inode->i_mtime = realinode->i_mtime; - inode->i_ctime = realinode->i_ctime; + inode_ctime_set(inode, inode_ctime_peek(realinode)); i_size_write(inode, i_size_read(realinode)); }