ufs: convert to new timestamp accessors

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

kernel os linux

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

authored by

Jeff Layton and committed by

Christian Brauner 2 years ago d936d382 f972fed7

+28 -22

3 changed files

expand all

ufs

dir.c

ialloc.c

inode.c

+3 -3

fs/ufs/dir.c

··· 107 107 ufs_commit_chunk(page, pos, len); 108 108 ufs_put_page(page); 109 109 if (update_times) 110 - dir->i_mtime = inode_set_ctime_current(dir); 110 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 111 111 mark_inode_dirty(dir); 112 112 ufs_handle_dirsync(dir); 113 113 } ··· 397 397 ufs_set_de_type(sb, de, inode->i_mode); 398 398 399 399 ufs_commit_chunk(page, pos, rec_len); 400 - dir->i_mtime = inode_set_ctime_current(dir); 400 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 401 401 402 402 mark_inode_dirty(dir); 403 403 err = ufs_handle_dirsync(dir); ··· 539 539 pde->d_reclen = cpu_to_fs16(sb, to - from); 540 540 dir->d_ino = 0; 541 541 ufs_commit_chunk(page, pos, to - from); 542 - inode->i_mtime = inode_set_ctime_current(inode); 542 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 543 543 mark_inode_dirty(inode); 544 544 err = ufs_handle_dirsync(inode); 545 545 out:

+1 -1

fs/ufs/ialloc.c

··· 292 292 inode_init_owner(&nop_mnt_idmap, inode, dir, mode); 293 293 inode->i_blocks = 0; 294 294 inode->i_generation = 0; 295 - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 295 + simple_inode_init_ts(inode); 296 296 ufsi->i_flags = UFS_I(dir)->i_flags; 297 297 ufsi->i_lastfrag = 0; 298 298 ufsi->i_shadow = 0;

+24 -18

fs/ufs/inode.c

··· 579 579 i_gid_write(inode, ufs_get_inode_gid(sb, ufs_inode)); 580 580 581 581 inode->i_size = fs64_to_cpu(sb, ufs_inode->ui_size); 582 - inode->i_atime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec); 582 + inode_set_atime(inode, 583 + (signed)fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec), 584 + 0); 583 585 inode_set_ctime(inode, 584 586 (signed)fs32_to_cpu(sb, ufs_inode->ui_ctime.tv_sec), 585 587 0); 586 - inode->i_mtime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec); 587 - inode->i_mtime.tv_nsec = 0; 588 - inode->i_atime.tv_nsec = 0; 588 + inode_set_mtime(inode, 589 + (signed)fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec), 590 + 0); 589 591 inode->i_blocks = fs32_to_cpu(sb, ufs_inode->ui_blocks); 590 592 inode->i_generation = fs32_to_cpu(sb, ufs_inode->ui_gen); 591 593 ufsi->i_flags = fs32_to_cpu(sb, ufs_inode->ui_flags); ··· 628 626 i_gid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_gid)); 629 627 630 628 inode->i_size = fs64_to_cpu(sb, ufs2_inode->ui_size); 631 - inode->i_atime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_atime); 629 + inode_set_atime(inode, fs64_to_cpu(sb, ufs2_inode->ui_atime), 630 + fs32_to_cpu(sb, ufs2_inode->ui_atimensec)); 632 631 inode_set_ctime(inode, fs64_to_cpu(sb, ufs2_inode->ui_ctime), 633 632 fs32_to_cpu(sb, ufs2_inode->ui_ctimensec)); 634 - inode->i_mtime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_mtime); 635 - inode->i_atime.tv_nsec = fs32_to_cpu(sb, ufs2_inode->ui_atimensec); 636 - inode->i_mtime.tv_nsec = fs32_to_cpu(sb, ufs2_inode->ui_mtimensec); 633 + inode_set_mtime(inode, fs64_to_cpu(sb, ufs2_inode->ui_mtime), 634 + fs32_to_cpu(sb, ufs2_inode->ui_mtimensec)); 637 635 inode->i_blocks = fs64_to_cpu(sb, ufs2_inode->ui_blocks); 638 636 inode->i_generation = fs32_to_cpu(sb, ufs2_inode->ui_gen); 639 637 ufsi->i_flags = fs32_to_cpu(sb, ufs2_inode->ui_flags); ··· 727 725 ufs_set_inode_gid(sb, ufs_inode, i_gid_read(inode)); 728 726 729 727 ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size); 730 - ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb, inode->i_atime.tv_sec); 728 + ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb, 729 + inode_get_atime_sec(inode)); 731 730 ufs_inode->ui_atime.tv_usec = 0; 732 731 ufs_inode->ui_ctime.tv_sec = cpu_to_fs32(sb, 733 - inode_get_ctime(inode).tv_sec); 732 + inode_get_ctime_sec(inode)); 734 733 ufs_inode->ui_ctime.tv_usec = 0; 735 - ufs_inode->ui_mtime.tv_sec = cpu_to_fs32(sb, inode->i_mtime.tv_sec); 734 + ufs_inode->ui_mtime.tv_sec = cpu_to_fs32(sb, 735 + inode_get_mtime_sec(inode)); 736 736 ufs_inode->ui_mtime.tv_usec = 0; 737 737 ufs_inode->ui_blocks = cpu_to_fs32(sb, inode->i_blocks); 738 738 ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags); ··· 774 770 ufs_inode->ui_gid = cpu_to_fs32(sb, i_gid_read(inode)); 775 771 776 772 ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size); 777 - ufs_inode->ui_atime = cpu_to_fs64(sb, inode->i_atime.tv_sec); 778 - ufs_inode->ui_atimensec = cpu_to_fs32(sb, inode->i_atime.tv_nsec); 779 - ufs_inode->ui_ctime = cpu_to_fs64(sb, inode_get_ctime(inode).tv_sec); 773 + ufs_inode->ui_atime = cpu_to_fs64(sb, inode_get_atime_sec(inode)); 774 + ufs_inode->ui_atimensec = cpu_to_fs32(sb, 775 + inode_get_atime_nsec(inode)); 776 + ufs_inode->ui_ctime = cpu_to_fs64(sb, inode_get_ctime_sec(inode)); 780 777 ufs_inode->ui_ctimensec = cpu_to_fs32(sb, 781 - inode_get_ctime(inode).tv_nsec); 782 - ufs_inode->ui_mtime = cpu_to_fs64(sb, inode->i_mtime.tv_sec); 783 - ufs_inode->ui_mtimensec = cpu_to_fs32(sb, inode->i_mtime.tv_nsec); 778 + inode_get_ctime_nsec(inode)); 779 + ufs_inode->ui_mtime = cpu_to_fs64(sb, inode_get_mtime_sec(inode)); 780 + ufs_inode->ui_mtimensec = cpu_to_fs32(sb, 781 + inode_get_mtime_nsec(inode)); 784 782 785 783 ufs_inode->ui_blocks = cpu_to_fs64(sb, inode->i_blocks); 786 784 ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags); ··· 1214 1208 truncate_setsize(inode, size); 1215 1209 1216 1210 ufs_truncate_blocks(inode); 1217 - inode->i_mtime = inode_set_ctime_current(inode); 1211 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1218 1212 mark_inode_dirty(inode); 1219 1213 out: 1220 1214 UFSD("EXIT: err %d\n", err);