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

affs: convert to new timestamp accessors

Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-15-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Jeff Layton and committed by
Christian Brauner
ea7719af ca9649e9

+9 -12
+2 -2
fs/affs/amigaffs.c
··· 60 60 mark_buffer_dirty_inode(dir_bh, dir); 61 61 affs_brelse(dir_bh); 62 62 63 - dir->i_mtime = inode_set_ctime_current(dir); 63 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 64 64 inode_inc_iversion(dir); 65 65 mark_inode_dirty(dir); 66 66 ··· 114 114 115 115 affs_brelse(bh); 116 116 117 - dir->i_mtime = inode_set_ctime_current(dir); 117 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 118 118 inode_inc_iversion(dir); 119 119 mark_inode_dirty(dir); 120 120
+7 -10
fs/affs/inode.c
··· 149 149 break; 150 150 } 151 151 152 - inode->i_mtime.tv_sec = inode->i_atime.tv_sec = 153 - inode_set_ctime(inode, 154 - (be32_to_cpu(tail->change.days) * 86400LL + 155 - be32_to_cpu(tail->change.mins) * 60 + 156 - be32_to_cpu(tail->change.ticks) / 50 + AFFS_EPOCH_DELTA) 157 - + sys_tz.tz_minuteswest * 60, 0).tv_sec; 158 - inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0; 152 + inode_set_mtime(inode, 153 + inode_set_atime(inode, inode_set_ctime(inode, (be32_to_cpu(tail->change.days) * 86400LL + be32_to_cpu(tail->change.mins) * 60 + be32_to_cpu(tail->change.ticks) / 50 + AFFS_EPOCH_DELTA) + sys_tz.tz_minuteswest * 60, 0).tv_sec, 0).tv_sec, 154 + 0); 159 155 affs_brelse(bh); 160 156 unlock_new_inode(inode); 161 157 return inode; ··· 183 187 } 184 188 tail = AFFS_TAIL(sb, bh); 185 189 if (tail->stype == cpu_to_be32(ST_ROOT)) { 186 - affs_secs_to_datestamp(inode->i_mtime.tv_sec, 190 + affs_secs_to_datestamp(inode_get_mtime_sec(inode), 187 191 &AFFS_ROOT_TAIL(sb, bh)->root_change); 188 192 } else { 189 193 tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect); 190 194 tail->size = cpu_to_be32(inode->i_size); 191 - affs_secs_to_datestamp(inode->i_mtime.tv_sec, &tail->change); 195 + affs_secs_to_datestamp(inode_get_mtime_sec(inode), 196 + &tail->change); 192 197 if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) { 193 198 uid = i_uid_read(inode); 194 199 gid = i_gid_read(inode); ··· 311 314 inode->i_gid = current_fsgid(); 312 315 inode->i_ino = block; 313 316 set_nlink(inode, 1); 314 - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 317 + simple_inode_init_ts(inode); 315 318 atomic_set(&AFFS_I(inode)->i_opencnt, 0); 316 319 AFFS_I(inode)->i_blkcnt = 0; 317 320 AFFS_I(inode)->i_lc = NULL;