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

sysv: 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-69-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Jeff Layton and committed by
Christian Brauner ae3d362a a1f13ed8

+10 -12
+3 -3
fs/sysv/dir.c
··· 224 224 memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2); 225 225 de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino); 226 226 dir_commit_chunk(page, pos, SYSV_DIRSIZE); 227 - dir->i_mtime = inode_set_ctime_current(dir); 227 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 228 228 mark_inode_dirty(dir); 229 229 err = sysv_handle_dirsync(dir); 230 230 out_page: ··· 249 249 } 250 250 de->inode = 0; 251 251 dir_commit_chunk(page, pos, SYSV_DIRSIZE); 252 - inode->i_mtime = inode_set_ctime_current(inode); 252 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 253 253 mark_inode_dirty(inode); 254 254 return sysv_handle_dirsync(inode); 255 255 } ··· 346 346 } 347 347 de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino); 348 348 dir_commit_chunk(page, pos, SYSV_DIRSIZE); 349 - dir->i_mtime = inode_set_ctime_current(dir); 349 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 350 350 mark_inode_dirty(dir); 351 351 return sysv_handle_dirsync(inode); 352 352 }
+1 -1
fs/sysv/ialloc.c
··· 165 165 dirty_sb(sb); 166 166 inode_init_owner(&nop_mnt_idmap, inode, dir, mode); 167 167 inode->i_ino = fs16_to_cpu(sbi, ino); 168 - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 168 + simple_inode_init_ts(inode); 169 169 inode->i_blocks = 0; 170 170 memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data)); 171 171 SYSV_I(inode)->i_dir_start_lookup = 0;
+5 -7
fs/sysv/inode.c
··· 200 200 i_gid_write(inode, (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid)); 201 201 set_nlink(inode, fs16_to_cpu(sbi, raw_inode->i_nlink)); 202 202 inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size); 203 - inode->i_atime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_atime); 204 - inode->i_mtime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_mtime); 203 + inode_set_atime(inode, fs32_to_cpu(sbi, raw_inode->i_atime), 0); 204 + inode_set_mtime(inode, fs32_to_cpu(sbi, raw_inode->i_mtime), 0); 205 205 inode_set_ctime(inode, fs32_to_cpu(sbi, raw_inode->i_ctime), 0); 206 - inode->i_atime.tv_nsec = 0; 207 - inode->i_mtime.tv_nsec = 0; 208 206 inode->i_blocks = 0; 209 207 210 208 si = SYSV_I(inode); ··· 251 253 raw_inode->i_gid = cpu_to_fs16(sbi, fs_high2lowgid(i_gid_read(inode))); 252 254 raw_inode->i_nlink = cpu_to_fs16(sbi, inode->i_nlink); 253 255 raw_inode->i_size = cpu_to_fs32(sbi, inode->i_size); 254 - raw_inode->i_atime = cpu_to_fs32(sbi, inode->i_atime.tv_sec); 255 - raw_inode->i_mtime = cpu_to_fs32(sbi, inode->i_mtime.tv_sec); 256 - raw_inode->i_ctime = cpu_to_fs32(sbi, inode_get_ctime(inode).tv_sec); 256 + raw_inode->i_atime = cpu_to_fs32(sbi, inode_get_atime_sec(inode)); 257 + raw_inode->i_mtime = cpu_to_fs32(sbi, inode_get_mtime_sec(inode)); 258 + raw_inode->i_ctime = cpu_to_fs32(sbi, inode_get_ctime_sec(inode)); 257 259 258 260 si = SYSV_I(inode); 259 261 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+1 -1
fs/sysv/itree.c
··· 423 423 } 424 424 n++; 425 425 } 426 - inode->i_mtime = inode_set_ctime_current(inode); 426 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 427 427 if (IS_SYNC(inode)) 428 428 sysv_sync_inode (inode); 429 429 else