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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B113EB64DC for ; Thu, 6 Jul 2023 14:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232831AbjGFODi (ORCPT ); Thu, 6 Jul 2023 10:03:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232827AbjGFODf (ORCPT ); Thu, 6 Jul 2023 10:03:35 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B170E19B2; Thu, 6 Jul 2023 07:03:33 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6417A22888; Thu, 6 Jul 2023 14:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1688652212; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xdFcyb1RZoUKytd7uMHK1ZbOk944N33M2Jy/fvCp6Hw=; b=FHR5yfBQLpO1Mscg+oRmSTInFxW7GhpSQCGw5l9qnLgWp2gpYhb1DuPxRkcVNSSWqXI6Ol pBvn5y0a21gwGDpTSgwytk3MGrYRdCAUNNIglK/BQzNv85qO17K6Gi/tp3MinMuTKxH84C 3GRmBymUCV63Rtii2fC51YVWeARi7yE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1688652212; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xdFcyb1RZoUKytd7uMHK1ZbOk944N33M2Jy/fvCp6Hw=; b=cg91hzMX65skuhhrRwRqPj6TA7UPNU0zkkr1MWku1nI/jfdTKkOrgKytxjCqnhlVwYk5rT ZMI3Mp2LMYozC9Bg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 507F9138EE; Thu, 6 Jul 2023 14:03:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SO2lE7TJpmQ2aQAAMHmgww (envelope-from ); Thu, 06 Jul 2023 14:03:32 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id DA716A0707; Thu, 6 Jul 2023 16:03:31 +0200 (CEST) Date: Thu, 6 Jul 2023 16:03:31 +0200 From: Jan Kara To: Jeff Layton Cc: Christian Brauner , Al Viro , Jan Kara , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, reiserfs-devel@vger.kernel.org Subject: Re: [PATCH v2 72/92] reiserfs: convert to ctime accessor functions Message-ID: <20230706140331.htfveqadxibh372u@quack3> References: <20230705185755.579053-1-jlayton@kernel.org> <20230705190309.579783-1-jlayton@kernel.org> <20230705190309.579783-70-jlayton@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230705190309.579783-70-jlayton@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wed 05-07-23 15:01:37, Jeff Layton wrote: > In later patches, we're going to change how the inode's ctime field is > used. Switch to using accessor functions instead of raw accesses of > inode->i_ctime. > > Signed-off-by: Jeff Layton Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/reiserfs/inode.c | 12 +++++------- > fs/reiserfs/ioctl.c | 4 ++-- > fs/reiserfs/namei.c | 11 ++++++----- > fs/reiserfs/stree.c | 4 ++-- > fs/reiserfs/super.c | 2 +- > fs/reiserfs/xattr.c | 5 +++-- > fs/reiserfs/xattr_acl.c | 2 +- > 7 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c > index 77bd3b27059f..86e55d4bb10d 100644 > --- a/fs/reiserfs/inode.c > +++ b/fs/reiserfs/inode.c > @@ -1259,9 +1259,8 @@ static void init_inode(struct inode *inode, struct treepath *path) > inode->i_size = sd_v1_size(sd); > inode->i_atime.tv_sec = sd_v1_atime(sd); > inode->i_mtime.tv_sec = sd_v1_mtime(sd); > - inode->i_ctime.tv_sec = sd_v1_ctime(sd); > + inode_set_ctime(inode, sd_v1_ctime(sd), 0); > inode->i_atime.tv_nsec = 0; > - inode->i_ctime.tv_nsec = 0; > inode->i_mtime.tv_nsec = 0; > > inode->i_blocks = sd_v1_blocks(sd); > @@ -1314,8 +1313,7 @@ static void init_inode(struct inode *inode, struct treepath *path) > i_gid_write(inode, sd_v2_gid(sd)); > inode->i_mtime.tv_sec = sd_v2_mtime(sd); > inode->i_atime.tv_sec = sd_v2_atime(sd); > - inode->i_ctime.tv_sec = sd_v2_ctime(sd); > - inode->i_ctime.tv_nsec = 0; > + inode_set_ctime(inode, sd_v2_ctime(sd), 0); > inode->i_mtime.tv_nsec = 0; > inode->i_atime.tv_nsec = 0; > inode->i_blocks = sd_v2_blocks(sd); > @@ -1374,7 +1372,7 @@ static void inode2sd(void *sd, struct inode *inode, loff_t size) > set_sd_v2_gid(sd_v2, i_gid_read(inode)); > set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec); > set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec); > - set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec); > + set_sd_v2_ctime(sd_v2, inode_get_ctime(inode).tv_sec); > set_sd_v2_blocks(sd_v2, to_fake_used_blocks(inode, SD_V2_SIZE)); > if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) > set_sd_v2_rdev(sd_v2, new_encode_dev(inode->i_rdev)); > @@ -1394,7 +1392,7 @@ static void inode2sd_v1(void *sd, struct inode *inode, loff_t size) > set_sd_v1_nlink(sd_v1, inode->i_nlink); > set_sd_v1_size(sd_v1, size); > set_sd_v1_atime(sd_v1, inode->i_atime.tv_sec); > - set_sd_v1_ctime(sd_v1, inode->i_ctime.tv_sec); > + set_sd_v1_ctime(sd_v1, inode_get_ctime(inode).tv_sec); > set_sd_v1_mtime(sd_v1, inode->i_mtime.tv_sec); > > if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) > @@ -1986,7 +1984,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, > > /* uid and gid must already be set by the caller for quota init */ > > - inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); > + inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); > inode->i_size = i_size; > inode->i_blocks = 0; > inode->i_bytes = 0; > diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c > index 6bf9b54e58ca..dd33f8cc6eda 100644 > --- a/fs/reiserfs/ioctl.c > +++ b/fs/reiserfs/ioctl.c > @@ -55,7 +55,7 @@ int reiserfs_fileattr_set(struct mnt_idmap *idmap, > } > sd_attrs_to_i_attrs(flags, inode); > REISERFS_I(inode)->i_attrs = flags; > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > mark_inode_dirty(inode); > err = 0; > unlock: > @@ -107,7 +107,7 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > err = -EFAULT; > goto setversion_out; > } > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > mark_inode_dirty(inode); > setversion_out: > mnt_drop_write_file(filp); > diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c > index 405ac59eb2dd..9c5704be2435 100644 > --- a/fs/reiserfs/namei.c > +++ b/fs/reiserfs/namei.c > @@ -572,7 +572,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, > } > > dir->i_size += paste_size; > - dir->i_mtime = dir->i_ctime = current_time(dir); > + dir->i_mtime = inode_set_ctime_current(dir); > if (!S_ISDIR(inode->i_mode) && visible) > /* reiserfs_mkdir or reiserfs_rename will do that by itself */ > reiserfs_update_sd(th, dir); > @@ -966,7 +966,8 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) > inode->i_nlink); > > clear_nlink(inode); > - inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(dir); > + dir->i_mtime = inode_set_ctime_to_ts(dir, > + inode_set_ctime_current(inode)); > reiserfs_update_sd(&th, inode); > > DEC_DIR_INODE_NLINK(dir) > @@ -1070,11 +1071,11 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) > inc_nlink(inode); > goto end_unlink; > } > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > reiserfs_update_sd(&th, inode); > > dir->i_size -= (de.de_entrylen + DEH_SIZE); > - dir->i_ctime = dir->i_mtime = current_time(dir); > + dir->i_mtime = inode_set_ctime_current(dir); > reiserfs_update_sd(&th, dir); > > if (!savelink) > @@ -1250,7 +1251,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir, > return err ? err : retval; > } > > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > reiserfs_update_sd(&th, inode); > > ihold(inode); > diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c > index ce5003986789..3676e02a0232 100644 > --- a/fs/reiserfs/stree.c > +++ b/fs/reiserfs/stree.c > @@ -2004,7 +2004,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th, > > if (update_timestamps) { > inode->i_mtime = current_time(inode); > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > } > reiserfs_update_sd(th, inode); > > @@ -2029,7 +2029,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th, > if (update_timestamps) { > /* this is truncate, not file closing */ > inode->i_mtime = current_time(inode); > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > } > reiserfs_update_sd(th, inode); > > diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c > index 929acce6e731..7eaf36b3de12 100644 > --- a/fs/reiserfs/super.c > +++ b/fs/reiserfs/super.c > @@ -2587,7 +2587,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, > return err; > if (inode->i_size < off + len - towrite) > i_size_write(inode, off + len - towrite); > - inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_mtime = inode_set_ctime_current(inode); > mark_inode_dirty(inode); > return len - towrite; > } > diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c > index 651027967159..6000964c2b80 100644 > --- a/fs/reiserfs/xattr.c > +++ b/fs/reiserfs/xattr.c > @@ -466,12 +466,13 @@ int reiserfs_commit_write(struct file *f, struct page *page, > static void update_ctime(struct inode *inode) > { > struct timespec64 now = current_time(inode); > + struct timespec64 ctime = inode_get_ctime(inode); > > if (inode_unhashed(inode) || !inode->i_nlink || > - timespec64_equal(&inode->i_ctime, &now)) > + timespec64_equal(&ctime, &now)) > return; > > - inode->i_ctime = current_time(inode); > + inode_set_ctime_to_ts(inode, now); > mark_inode_dirty(inode); > } > > diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c > index 138060452678..064264992b49 100644 > --- a/fs/reiserfs/xattr_acl.c > +++ b/fs/reiserfs/xattr_acl.c > @@ -285,7 +285,7 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, > if (error == -ENODATA) { > error = 0; > if (type == ACL_TYPE_ACCESS) { > - inode->i_ctime = current_time(inode); > + inode_set_ctime_current(inode); > mark_inode_dirty(inode); > } > } > -- > 2.41.0 > -- Jan Kara SUSE Labs, CR