Re: [Jfs-discussion] [PATCH 47/87] fs/jfs: convert to new inode {a, m}time accessors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

On 9/28/23 6:02AM, Jeff Layton via Jfs-discussion wrote:

Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>


Acked-by: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>

---
  fs/jfs/inode.c     |  2 +-
  fs/jfs/jfs_imap.c  | 16 ++++++++--------
  fs/jfs/jfs_inode.c |  2 +-
  fs/jfs/namei.c     | 20 +++++++++++---------
  fs/jfs/super.c     |  2 +-
  5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 920d58a1566b..1a6b5921d17a 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -393,7 +393,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length)
  			break;
  		}
- ip->i_mtime = inode_set_ctime_current(ip); 
+		inode_set_mtime_to_ts(ip, inode_set_ctime_current(ip));
  		mark_inode_dirty(ip);
txCommit(tid, 1, &ip, 0); 
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 923a58422c46..57852a515660 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -3061,10 +3061,10 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
  	}
ip->i_size = le64_to_cpu(dip->di_size); 
-	ip->i_atime.tv_sec = le32_to_cpu(dip->di_atime.tv_sec);
-	ip->i_atime.tv_nsec = le32_to_cpu(dip->di_atime.tv_nsec);
-	ip->i_mtime.tv_sec = le32_to_cpu(dip->di_mtime.tv_sec);
-	ip->i_mtime.tv_nsec = le32_to_cpu(dip->di_mtime.tv_nsec);
+	inode_set_atime(ip, le32_to_cpu(dip->di_atime.tv_sec),
+			le32_to_cpu(dip->di_atime.tv_nsec));
+	inode_set_mtime(ip, le32_to_cpu(dip->di_mtime.tv_sec),
+			le32_to_cpu(dip->di_mtime.tv_nsec));
  	inode_set_ctime(ip, le32_to_cpu(dip->di_ctime.tv_sec),
  			le32_to_cpu(dip->di_ctime.tv_nsec));
  	ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks));
@@ -3138,12 +3138,12 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
  	else /* Leave the original permissions alone */
  		dip->di_mode = cpu_to_le32(jfs_ip->mode2);
- dip->di_atime.tv_sec = cpu_to_le32(ip->i_atime.tv_sec); 
-	dip->di_atime.tv_nsec = cpu_to_le32(ip->i_atime.tv_nsec);
+	dip->di_atime.tv_sec = cpu_to_le32(inode_get_atime(ip).tv_sec);
+	dip->di_atime.tv_nsec = cpu_to_le32(inode_get_atime(ip).tv_nsec);
  	dip->di_ctime.tv_sec = cpu_to_le32(inode_get_ctime(ip).tv_sec);
  	dip->di_ctime.tv_nsec = cpu_to_le32(inode_get_ctime(ip).tv_nsec);
-	dip->di_mtime.tv_sec = cpu_to_le32(ip->i_mtime.tv_sec);
-	dip->di_mtime.tv_nsec = cpu_to_le32(ip->i_mtime.tv_nsec);
+	dip->di_mtime.tv_sec = cpu_to_le32(inode_get_mtime(ip).tv_sec);
+	dip->di_mtime.tv_nsec = cpu_to_le32(inode_get_mtime(ip).tv_nsec);
  	dip->di_ixpxd = jfs_ip->ixpxd;	/* in-memory pxd's are little-endian */
  	dip->di_acl = jfs_ip->acl;	/* as are dxd's */
  	dip->di_ea = jfs_ip->ea;
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 87594efa7f7c..9137e5d96db8 100644
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -97,7 +97,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
  	jfs_inode->mode2 |= inode->i_mode;
inode->i_blocks = 0; 
-	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+	simple_inode_init_ts(inode);
  	jfs_inode->otime = inode_get_ctime(inode).tv_sec;
  	inode->i_generation = JFS_SBI(sb)->gengen++;
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c 
index 57d7a4300210..d68a4e6ac345 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -149,7 +149,7 @@ static int jfs_create(struct mnt_idmap *idmap, struct inode *dip,
mark_inode_dirty(ip); - dip->i_mtime = inode_set_ctime_current(dip); 
+	inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
mark_inode_dirty(dip); @@ -284,7 +284,7 @@ static int jfs_mkdir(struct mnt_idmap *idmap, struct inode *dip, /* update parent directory inode */ 
  	inc_nlink(dip);		/* for '..' from child directory */
-	dip->i_mtime = inode_set_ctime_current(dip);
+	inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
  	mark_inode_dirty(dip);
rc = txCommit(tid, 2, &iplist[0], 0); 
@@ -390,7 +390,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
  	/* update parent directory's link count corresponding
  	 * to ".." entry of the target directory deleted
  	 */
-	dip->i_mtime = inode_set_ctime_current(dip);
+	inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
  	inode_dec_link_count(dip);
/* 
@@ -512,7 +512,8 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
ASSERT(ip->i_nlink); - dip->i_mtime = inode_set_ctime_to_ts(dip, inode_set_ctime_current(ip)); 
+	inode_set_mtime_to_ts(dip,
+			      inode_set_ctime_to_ts(dip, inode_set_ctime_current(ip)));
  	mark_inode_dirty(dip);
/* update target's inode */ 
@@ -828,7 +829,7 @@ static int jfs_link(struct dentry *old_dentry,
  	/* update object inode */
  	inc_nlink(ip);		/* for new link */
  	inode_set_ctime_current(ip);
-	dir->i_mtime = inode_set_ctime_current(dir);
+	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
  	mark_inode_dirty(dir);
  	ihold(ip);
@@ -1028,7 +1029,7 @@ static int jfs_symlink(struct mnt_idmap *idmap, struct inode *dip, mark_inode_dirty(ip); - dip->i_mtime = inode_set_ctime_current(dip); 
+	inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
  	mark_inode_dirty(dip);
  	/*
  	 * commit update of parent directory and link object
@@ -1271,7 +1272,7 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
  	inode_set_ctime_current(old_ip);
  	mark_inode_dirty(old_ip);
- new_dir->i_mtime = inode_set_ctime_current(new_dir); 
+	inode_set_mtime_to_ts(new_dir, inode_set_ctime_current(new_dir));
  	mark_inode_dirty(new_dir);
/* Build list of inodes modified by this transaction */ 
@@ -1283,7 +1284,8 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
if (old_dir != new_dir) { 
  		iplist[ipcount++] = new_dir;
-		old_dir->i_mtime = inode_set_ctime_current(old_dir);
+		inode_set_mtime_to_ts(old_dir,
+				      inode_set_ctime_current(old_dir));
  		mark_inode_dirty(old_dir);
  	}
@@ -1416,7 +1418,7 @@ static int jfs_mknod(struct mnt_idmap *idmap, struct inode *dir, mark_inode_dirty(ip); - dir->i_mtime = inode_set_ctime_current(dir); 
+	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
mark_inode_dirty(dir); diff --git a/fs/jfs/super.c b/fs/jfs/super.c 
index 2e2f7f6d36a0..966826c394ee 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -818,7 +818,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,
  	}
  	if (inode->i_size < off+len-towrite)
  		i_size_write(inode, off+len-towrite);
-	inode->i_mtime = inode_set_ctime_current(inode);
+	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
  	mark_inode_dirty(inode);
  	inode_unlock(inode);
  	return len - towrite;
[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [NTFS 3]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [NTFS 3]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux