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

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

authored by

Jeff Layton and committed by
Christian Brauner
5cdc59fc 4c72a36e

+11 -12
+3 -3
fs/ext2/dir.c
··· 468 468 ext2_set_de_type(de, inode); 469 469 ext2_commit_chunk(page, pos, len); 470 470 if (update_times) 471 - dir->i_mtime = inode_set_ctime_current(dir); 471 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 472 472 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL; 473 473 mark_inode_dirty(dir); 474 474 return ext2_handle_dirsync(dir); ··· 555 555 de->inode = cpu_to_le32(inode->i_ino); 556 556 ext2_set_de_type (de, inode); 557 557 ext2_commit_chunk(page, pos, rec_len); 558 - dir->i_mtime = inode_set_ctime_current(dir); 558 + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); 559 559 EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL; 560 560 mark_inode_dirty(dir); 561 561 err = ext2_handle_dirsync(dir); ··· 606 606 pde->rec_len = ext2_rec_len_to_disk(to - from); 607 607 dir->inode = 0; 608 608 ext2_commit_chunk(page, pos, to - from); 609 - inode->i_mtime = inode_set_ctime_current(inode); 609 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 610 610 EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL; 611 611 mark_inode_dirty(inode); 612 612 return ext2_handle_dirsync(inode);
+1 -1
fs/ext2/ialloc.c
··· 546 546 547 547 inode->i_ino = ino; 548 548 inode->i_blocks = 0; 549 - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); 549 + simple_inode_init_ts(inode); 550 550 memset(ei->i_data, 0, sizeof(ei->i_data)); 551 551 ei->i_flags = 552 552 ext2_mask_flags(mode, EXT2_I(dir)->i_flags & EXT2_FL_INHERITED);
+6 -7
fs/ext2/inode.c
··· 1291 1291 __ext2_truncate_blocks(inode, newsize); 1292 1292 filemap_invalidate_unlock(inode->i_mapping); 1293 1293 1294 - inode->i_mtime = inode_set_ctime_current(inode); 1294 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1295 1295 if (inode_needs_sync(inode)) { 1296 1296 sync_mapping_buffers(inode->i_mapping); 1297 1297 sync_inode_metadata(inode, 1); ··· 1412 1412 i_gid_write(inode, i_gid); 1413 1413 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); 1414 1414 inode->i_size = le32_to_cpu(raw_inode->i_size); 1415 - inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); 1415 + inode_set_atime(inode, (signed)le32_to_cpu(raw_inode->i_atime), 0); 1416 1416 inode_set_ctime(inode, (signed)le32_to_cpu(raw_inode->i_ctime), 0); 1417 - inode->i_mtime.tv_sec = (signed)le32_to_cpu(raw_inode->i_mtime); 1418 - inode->i_atime.tv_nsec = inode->i_mtime.tv_nsec = 0; 1417 + inode_set_mtime(inode, (signed)le32_to_cpu(raw_inode->i_mtime), 0); 1419 1418 ei->i_dtime = le32_to_cpu(raw_inode->i_dtime); 1420 1419 /* We now have enough fields to check if the inode was active or not. 1421 1420 * This is needed because nfsd might try to access dead inodes ··· 1543 1544 } 1544 1545 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); 1545 1546 raw_inode->i_size = cpu_to_le32(inode->i_size); 1546 - raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); 1547 - raw_inode->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec); 1548 - raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec); 1547 + raw_inode->i_atime = cpu_to_le32(inode_get_atime_sec(inode)); 1548 + raw_inode->i_ctime = cpu_to_le32(inode_get_ctime_sec(inode)); 1549 + raw_inode->i_mtime = cpu_to_le32(inode_get_mtime_sec(inode)); 1549 1550 1550 1551 raw_inode->i_blocks = cpu_to_le32(inode->i_blocks); 1551 1552 raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
+1 -1
fs/ext2/super.c
··· 1572 1572 if (inode->i_size < off+len-towrite) 1573 1573 i_size_write(inode, off+len-towrite); 1574 1574 inode_inc_iversion(inode); 1575 - inode->i_mtime = inode_set_ctime_current(inode); 1575 + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); 1576 1576 mark_inode_dirty(inode); 1577 1577 return len - towrite; 1578 1578 }