Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

jfs: convert to ctime accessor functions

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.

Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-53-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Jeff Layton and committed by
Christian Brauner
ad9dc5df d8b23c61

+23 -23
+1 -1
fs/jfs/acl.c
··· 116 116 if (!rc) { 117 117 if (update_mode) { 118 118 inode->i_mode = mode; 119 - inode->i_ctime = current_time(inode); 119 + inode_set_ctime_current(inode); 120 120 mark_inode_dirty(inode); 121 121 } 122 122 rc = txCommit(tid, 1, &inode, 0);
+1 -1
fs/jfs/inode.c
··· 393 393 break; 394 394 } 395 395 396 - ip->i_mtime = ip->i_ctime = current_time(ip); 396 + ip->i_mtime = inode_set_ctime_current(ip); 397 397 mark_inode_dirty(ip); 398 398 399 399 txCommit(tid, 1, &ip, 0);
+1 -1
fs/jfs/ioctl.c
··· 96 96 jfs_inode->mode2 = flags; 97 97 98 98 jfs_set_inode_flags(inode); 99 - inode->i_ctime = current_time(inode); 99 + inode_set_ctime_current(inode); 100 100 mark_inode_dirty(inode); 101 101 102 102 return 0;
+4 -4
fs/jfs/jfs_imap.c
··· 3064 3064 ip->i_atime.tv_nsec = le32_to_cpu(dip->di_atime.tv_nsec); 3065 3065 ip->i_mtime.tv_sec = le32_to_cpu(dip->di_mtime.tv_sec); 3066 3066 ip->i_mtime.tv_nsec = le32_to_cpu(dip->di_mtime.tv_nsec); 3067 - ip->i_ctime.tv_sec = le32_to_cpu(dip->di_ctime.tv_sec); 3068 - ip->i_ctime.tv_nsec = le32_to_cpu(dip->di_ctime.tv_nsec); 3067 + inode_set_ctime(ip, le32_to_cpu(dip->di_ctime.tv_sec), 3068 + le32_to_cpu(dip->di_ctime.tv_nsec)); 3069 3069 ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks)); 3070 3070 ip->i_generation = le32_to_cpu(dip->di_gen); 3071 3071 ··· 3139 3139 3140 3140 dip->di_atime.tv_sec = cpu_to_le32(ip->i_atime.tv_sec); 3141 3141 dip->di_atime.tv_nsec = cpu_to_le32(ip->i_atime.tv_nsec); 3142 - dip->di_ctime.tv_sec = cpu_to_le32(ip->i_ctime.tv_sec); 3143 - dip->di_ctime.tv_nsec = cpu_to_le32(ip->i_ctime.tv_nsec); 3142 + dip->di_ctime.tv_sec = cpu_to_le32(inode_get_ctime(ip).tv_sec); 3143 + dip->di_ctime.tv_nsec = cpu_to_le32(inode_get_ctime(ip).tv_nsec); 3144 3144 dip->di_mtime.tv_sec = cpu_to_le32(ip->i_mtime.tv_sec); 3145 3145 dip->di_mtime.tv_nsec = cpu_to_le32(ip->i_mtime.tv_nsec); 3146 3146 dip->di_ixpxd = jfs_ip->ixpxd; /* in-memory pxd's are little-endian */
+2 -2
fs/jfs/jfs_inode.c
··· 97 97 jfs_inode->mode2 |= inode->i_mode; 98 98 99 99 inode->i_blocks = 0; 100 - inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); 101 - jfs_inode->otime = inode->i_ctime.tv_sec; 100 + inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 101 + jfs_inode->otime = inode_get_ctime(inode).tv_sec; 102 102 inode->i_generation = JFS_SBI(sb)->gengen++; 103 103 104 104 jfs_inode->cflag = 0;
+12 -12
fs/jfs/namei.c
··· 149 149 150 150 mark_inode_dirty(ip); 151 151 152 - dip->i_ctime = dip->i_mtime = current_time(dip); 152 + dip->i_mtime = inode_set_ctime_current(dip); 153 153 154 154 mark_inode_dirty(dip); 155 155 ··· 284 284 285 285 /* update parent directory inode */ 286 286 inc_nlink(dip); /* for '..' from child directory */ 287 - dip->i_ctime = dip->i_mtime = current_time(dip); 287 + dip->i_mtime = inode_set_ctime_current(dip); 288 288 mark_inode_dirty(dip); 289 289 290 290 rc = txCommit(tid, 2, &iplist[0], 0); ··· 390 390 /* update parent directory's link count corresponding 391 391 * to ".." entry of the target directory deleted 392 392 */ 393 - dip->i_ctime = dip->i_mtime = current_time(dip); 393 + dip->i_mtime = inode_set_ctime_current(dip); 394 394 inode_dec_link_count(dip); 395 395 396 396 /* ··· 512 512 513 513 ASSERT(ip->i_nlink); 514 514 515 - ip->i_ctime = dip->i_ctime = dip->i_mtime = current_time(ip); 515 + dip->i_mtime = inode_set_ctime_to_ts(dip, inode_set_ctime_current(ip)); 516 516 mark_inode_dirty(dip); 517 517 518 518 /* update target's inode */ ··· 827 827 828 828 /* update object inode */ 829 829 inc_nlink(ip); /* for new link */ 830 - ip->i_ctime = current_time(ip); 831 - dir->i_ctime = dir->i_mtime = current_time(dir); 830 + inode_set_ctime_current(ip); 831 + dir->i_mtime = inode_set_ctime_current(dir); 832 832 mark_inode_dirty(dir); 833 833 ihold(ip); 834 834 ··· 1028 1028 1029 1029 mark_inode_dirty(ip); 1030 1030 1031 - dip->i_ctime = dip->i_mtime = current_time(dip); 1031 + dip->i_mtime = inode_set_ctime_current(dip); 1032 1032 mark_inode_dirty(dip); 1033 1033 /* 1034 1034 * commit update of parent directory and link object ··· 1205 1205 tblk->xflag |= COMMIT_DELETE; 1206 1206 tblk->u.ip = new_ip; 1207 1207 } else { 1208 - new_ip->i_ctime = current_time(new_ip); 1208 + inode_set_ctime_current(new_ip); 1209 1209 mark_inode_dirty(new_ip); 1210 1210 } 1211 1211 } else { ··· 1268 1268 /* 1269 1269 * Update ctime on changed/moved inodes & mark dirty 1270 1270 */ 1271 - old_ip->i_ctime = current_time(old_ip); 1271 + inode_set_ctime_current(old_ip); 1272 1272 mark_inode_dirty(old_ip); 1273 1273 1274 - new_dir->i_ctime = new_dir->i_mtime = current_time(new_dir); 1274 + new_dir->i_mtime = inode_set_ctime_current(new_dir); 1275 1275 mark_inode_dirty(new_dir); 1276 1276 1277 1277 /* Build list of inodes modified by this transaction */ ··· 1283 1283 1284 1284 if (old_dir != new_dir) { 1285 1285 iplist[ipcount++] = new_dir; 1286 - old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir); 1286 + old_dir->i_mtime = inode_set_ctime_current(old_dir); 1287 1287 mark_inode_dirty(old_dir); 1288 1288 } 1289 1289 ··· 1416 1416 1417 1417 mark_inode_dirty(ip); 1418 1418 1419 - dir->i_ctime = dir->i_mtime = current_time(dir); 1419 + dir->i_mtime = inode_set_ctime_current(dir); 1420 1420 1421 1421 mark_inode_dirty(dir); 1422 1422
+1 -1
fs/jfs/super.c
··· 818 818 } 819 819 if (inode->i_size < off+len-towrite) 820 820 i_size_write(inode, off+len-towrite); 821 - inode->i_mtime = inode->i_ctime = current_time(inode); 821 + inode->i_mtime = inode_set_ctime_current(inode); 822 822 mark_inode_dirty(inode); 823 823 inode_unlock(inode); 824 824 return len - towrite;
+1 -1
fs/jfs/xattr.c
··· 647 647 if (old_blocks) 648 648 dquot_free_block(inode, old_blocks); 649 649 650 - inode->i_ctime = current_time(inode); 650 + inode_set_ctime_current(inode); 651 651 652 652 return 0; 653 653 }