reiserfs: convert to simple_rename_timestamp
Subsystems (74)
Jeff Layton
maintainerRe: [PATCH v2 62/92] ocfs2: convert to ctime accessor functions
In reply to Joseph QiQuoted 150 lines · Joseph Qi
Quoted 148 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>--- fs/ocfs2/acl.c | 6 +++--- fs/ocfs2/alloc.c | 6 +++--- fs/ocfs2/aops.c | 2 +- fs/ocfs2/dir.c | 8 ++++---- fs/ocfs2/dlmfs/dlmfs.c | 4 ++-- fs/ocfs2/dlmglue.c | 7 +++++-- fs/ocfs2/file.c | 16 +++++++++------- fs/ocfs2/inode.c | 12 ++++++------ fs/ocfs2/move_extents.c | 6 +++--- fs/ocfs2/namei.c | 21 +++++++++++---------- fs/ocfs2/refcounttree.c | 14 +++++++------- fs/ocfs2/xattr.c | 6 +++--- 12 files changed, 57 insertions(+), 51 deletions(-)fs/ocfs2/acl.c +3
-3@@ -191,10 +191,10 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, } inode->i_mode = new_mode; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); di->i_mode =cpu_to_le16 (inode->i_mode); - di->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + di->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,0 );ocfs2_journal_dirty (handle, di_bh);fs/ocfs2/alloc.c +3
-3@@ -7436,10 +7436,10 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, } inode->i_blocks =ocfs2_inode_sector_count (inode); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); - di->i_ctime = di->i_mtime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + di->i_ctime = di->i_mtime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,1 );ocfs2_journal_dirty (handle, di_bh);fs/ocfs2/aops.c +1
-1@@ -2048,7 +2048,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, } inode->i_blocks =ocfs2_inode_sector_count (inode); di->i_size =cpu_to_le64 ((u64 )i_size_read (inode)); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec);if (handle)fs/ocfs2/dir.c +4
-4@@ -1658,7 +1658,7 @@ int __ocfs2_add_entry(handle_t *handle, offset, ocfs2_dir_trailer_blk_off(dir->i_sb));if (ocfs2_dirent_would_fit (de, rec_len)) { - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); retval =ocfs2_mark_inode_dirty (handle, dir, parent_fe_bh);if (retval <0 ) {mlog_errno (retval);@@ -2962,11 +2962,11 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,ocfs2_dinode_new_extent_list (dir, di);i_size_write (dir, sb->s_blocksize); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); di->i_size =cpu_to_le64 (sb->s_blocksize); - di->i_ctime = di->i_mtime =cpu_to_le64 (dir->i_ctime.tv_sec); - di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (dir->i_ctime.tv_nsec); + di->i_ctime = di->i_mtime =cpu_to_le64 (inode_get_ctime (dir).tv_sec); + di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode_get_ctime (dir).tv_nsec);ocfs2_update_inode_fsync_trans (handle, dir,1 );/* fs/ocfs2/dlmfs/dlmfs.c +2
-2@@ -337,7 +337,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)if (inode) { inode->i_ino =get_next_ino ();inode_init_owner (&nop_mnt_idmap, inode,NULL , mode); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);inc_nlink (inode); inode->i_fop = &simple_dir_operations;@@ -360,7 +360,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent, inode->i_ino =get_next_ino ();inode_init_owner (&nop_mnt_idmap, inode, parent, mode); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); ip =DLMFS_I (inode); ip->ip_conn =DLMFS_I (parent)->ip_conn;fs/ocfs2/dlmglue.c +3
-1@@ -2162,6 +2162,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)struct ocfs2_inode_info *oi =OCFS2_I (inode);struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;struct ocfs2_meta_lvb *lvb; +struct timespec64 ctime =inode_get_ctime (inode); lvb =ocfs2_dlm_lvb (&lockres->l_lksb);@@ -2185,7 +2186,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode) lvb->lvb_iatime_packed =cpu_to_be64 (ocfs2_pack_timespec (&inode->i_atime)); lvb->lvb_ictime_packed = -cpu_to_be64 (ocfs2_pack_timespec (&inode->i_ctime)); +cpu_to_be64 (ocfs2_pack_timespec (&ctime)); lvb->lvb_imtime_packed =cpu_to_be64 (ocfs2_pack_timespec (&inode->i_mtime)); lvb->lvb_iattr =cpu_to_be32 (oi->ip_attr);@@ -2208,6 +2209,7 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode)struct ocfs2_inode_info *oi =OCFS2_I (inode);struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;struct ocfs2_meta_lvb *lvb; +struct timespec64 ctime;mlog_meta_lvb (0 , lockres);
Quoted 11 lines
fs/ocfs2/dlmglue.c static int ocfs2_refresh_inode_from_lvb(struct inode *inode) · line 2245
Quoted 8 lines
fs/ocfs2/dlmglue.c +2
-1@@ -2238,8 +2240,9 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode) be64_to_cpu(lvb->lvb_iatime_packed));ocfs2_unpack_timespec (&inode->i_mtime,be64_to_cpu (lvb->lvb_imtime_packed)); -ocfs2_unpack_timespec (&inode->i_ctime, +ocfs2_unpack_timespec (&ctime,be64_to_cpu (lvb->lvb_ictime_packed)); +inode_set_ctime_to_ts (inode, ctime);A quick glance, it seems not an equivalent replace.
How so?
The old code unpacked the time directly into the inode->i_ctime. The new one unpacks it into a local timespec64 variable and then sets the inode->i_ctime to that value. The result should still be the same.
Quoted 242 lines
Quoted 242 lines
fs/ocfs2/dlmglue.c +0
-0spin_unlock (&oi->ip_lock);return 0 ; }fs/ocfs2/file.c +9
-7@@ -232,8 +232,10 @@ int ocfs2_should_update_atime(struct inode *inode,return 0 ;if (vfsmnt->mnt_flags &MNT_RELATIME ) { +struct timespec64 ctime =inode_get_ctime (inode); +if ((timespec64_compare (&inode->i_atime, &inode->i_mtime) <=0 ) || - (timespec64_compare (&inode->i_atime, &inode->i_ctime) <=0 )) + (timespec64_compare (&inode->i_atime, &ctime) <=0 ))return 1 ;return 0 ;@@ -294,7 +296,7 @@ int ocfs2_set_inode_size(handle_t *handle,i_size_write (inode, new_i_size); inode->i_blocks =ocfs2_inode_sector_count (inode); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); status =ocfs2_mark_inode_dirty (handle, inode, fe_bh);if (status <0 ) {@@ -415,12 +417,12 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, }i_size_write (inode, new_i_size); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); di = (struct ocfs2_dinode *) fe_bh->b_data; di->i_size =cpu_to_le64 (new_i_size); - di->i_ctime = di->i_mtime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + di->i_ctime = di->i_mtime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,0 );ocfs2_journal_dirty (handle, fe_bh);@@ -819,7 +821,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,i_size_write (inode, abs_to); inode->i_blocks =ocfs2_inode_sector_count (inode); di->i_size =cpu_to_le64 ((u64 )i_size_read (inode)); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); di->i_mtime_nsec = di->i_ctime_nsec;@@ -2038,7 +2040,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode, goto out_inode_unlock; } - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); ret =ocfs2_mark_inode_dirty (handle, inode, di_bh);if (ret <0 )mlog_errno (ret);fs/ocfs2/inode.c +6
-6@@ -306,8 +306,8 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, inode->i_atime.tv_nsec =le32_to_cpu (fe->i_atime_nsec); inode->i_mtime.tv_sec =le64_to_cpu (fe->i_mtime); inode->i_mtime.tv_nsec =le32_to_cpu (fe->i_mtime_nsec); - inode->i_ctime.tv_sec =le64_to_cpu (fe->i_ctime); - inode->i_ctime.tv_nsec =le32_to_cpu (fe->i_ctime_nsec); +inode_set_ctime (inode,le64_to_cpu (fe->i_ctime), +le32_to_cpu (fe->i_ctime_nsec));if (OCFS2_I (inode)->ip_blkno !=le64_to_cpu (fe->i_blkno)) mlog(ML_ERROR,@@ -1314,8 +1314,8 @@ int ocfs2_mark_inode_dirty(handle_t *handle, fe->i_mode =cpu_to_le16 (inode->i_mode); fe->i_atime =cpu_to_le64 (inode->i_atime.tv_sec); fe->i_atime_nsec =cpu_to_le32 (inode->i_atime.tv_nsec); - fe->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - fe->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + fe->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + fe->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec); fe->i_mtime =cpu_to_le64 (inode->i_mtime.tv_sec); fe->i_mtime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec);@@ -1352,8 +1352,8 @@ void ocfs2_refresh_inode(struct inode *inode, inode->i_atime.tv_nsec =le32_to_cpu (fe->i_atime_nsec); inode->i_mtime.tv_sec =le64_to_cpu (fe->i_mtime); inode->i_mtime.tv_nsec =le32_to_cpu (fe->i_mtime_nsec); - inode->i_ctime.tv_sec =le64_to_cpu (fe->i_ctime); - inode->i_ctime.tv_nsec =le32_to_cpu (fe->i_ctime_nsec); +inode_set_ctime (inode,le64_to_cpu (fe->i_ctime), +le32_to_cpu (fe->i_ctime_nsec));spin_unlock (&OCFS2_I (inode)->ip_lock); }fs/ocfs2/move_extents.c +3
-3@@ -950,9 +950,9 @@ static int ocfs2_move_extents(struct ocfs2_move_extents_context *context) } di = (struct ocfs2_dinode *)di_bh->b_data; - inode->i_ctime =current_time (inode); - di->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); +inode_set_ctime_current (inode); + di->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,0 );ocfs2_journal_dirty (handle, di_bh);fs/ocfs2/namei.c +11
-10@@ -793,10 +793,10 @@ static int ocfs2_link(struct dentry *old_dentry, }inc_nlink (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);ocfs2_set_links_count (fe, inode->i_nlink); - fe->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - fe->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + fe->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + fe->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_journal_dirty (handle, fe_bh); err = ocfs2_add_entry(handle, dentry, inode,@@ -995,7 +995,7 @@ static int ocfs2_unlink(struct inode *dir,ocfs2_set_links_count (fe, inode->i_nlink);ocfs2_journal_dirty (handle, fe_bh); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);if (S_ISDIR (inode->i_mode))drop_nlink (dir);@@ -1537,7 +1537,7 @@ static int ocfs2_rename(struct mnt_idmap *idmap, new_dir_bh, &target_insert); } - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);mark_inode_dirty (old_inode); status = ocfs2_journal_access_di(handle, INODE_CACHE(old_inode),@@ -1546,8 +1546,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap,if (status >=0 ) { old_di = (struct ocfs2_dinode *) old_inode_bh->b_data; - old_di->i_ctime =cpu_to_le64 (old_inode->i_ctime.tv_sec); - old_di->i_ctime_nsec =cpu_to_le32 (old_inode->i_ctime.tv_nsec); + old_di->i_ctime =cpu_to_le64 (inode_get_ctime (old_inode).tv_sec); + old_di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (old_inode).tv_nsec);ocfs2_journal_dirty (handle, old_inode_bh); }else mlog_errno (status);@@ -1586,9 +1586,9 @@ static int ocfs2_rename(struct mnt_idmap *idmap,if (new_inode) {drop_nlink (new_inode); - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode); } - old_dir->i_ctime = old_dir->i_mtime =current_time (old_dir); + old_dir->i_mtime =inode_set_ctime_current (old_dir);if (update_dot_dot) { status = ocfs2_update_entry(old_inode, handle,@@ -1610,7 +1610,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap,if (old_dir != new_dir) {/* Keep the same times on both directories.*/ - new_dir->i_ctime = new_dir->i_mtime = old_dir->i_ctime; + new_dir->i_mtime =inode_set_ctime_to_ts (new_dir, +inode_get_ctime (old_dir));/* * This will also pick up the i_nlink change from the fs/ocfs2/refcounttree.c +7
-7@@ -3750,9 +3750,9 @@ static int ocfs2_change_ctime(struct inode *inode, goto out_commit; } - inode->i_ctime =current_time (inode); - di->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); +inode_set_ctime_current (inode); + di->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_journal_dirty (handle, di_bh);@@ -4073,10 +4073,10 @@ static int ocfs2_complete_reflink(struct inode *s_inode,* we want mtime to appear identical to the source and * update ctime. */ - t_inode->i_ctime =current_time (t_inode); +inode_set_ctime_current (t_inode); - di->i_ctime =cpu_to_le64 (t_inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (t_inode->i_ctime.tv_nsec); + di->i_ctime =cpu_to_le64 (inode_get_ctime (t_inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (t_inode).tv_nsec); t_inode->i_mtime = s_inode->i_mtime; di->i_mtime = s_di->i_mtime;@@ -4456,7 +4456,7 @@ int ocfs2_reflink_update_dest(struct inode *dest,if (newlen >i_size_read (dest))i_size_write (dest, newlen);spin_unlock (&OCFS2_I (dest)->ip_lock); - dest->i_ctime = dest->i_mtime =current_time (dest); + dest->i_mtime =inode_set_ctime_current (dest); ret =ocfs2_mark_inode_dirty (handle, dest, d_bh);if (ret) {fs/ocfs2/xattr.c +3
-3@@ -3421,9 +3421,9 @@ static int __ocfs2_xattr_set_handle(struct inode *inode, goto out; } - inode->i_ctime =current_time (inode); - di->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); +inode_set_ctime_current (inode); + di->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_journal_dirty (ctxt->handle, xis->inode_bh); } out:
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v2 62/92] ocfs2: convert to ctime accessor functions
Quoted 164 lines · Jeff Layton
Quoted 150 lines · Joseph Qi
Quoted 148 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>--- fs/ocfs2/acl.c | 6 +++--- fs/ocfs2/alloc.c | 6 +++--- fs/ocfs2/aops.c | 2 +- fs/ocfs2/dir.c | 8 ++++---- fs/ocfs2/dlmfs/dlmfs.c | 4 ++-- fs/ocfs2/dlmglue.c | 7 +++++-- fs/ocfs2/file.c | 16 +++++++++------- fs/ocfs2/inode.c | 12 ++++++------ fs/ocfs2/move_extents.c | 6 +++--- fs/ocfs2/namei.c | 21 +++++++++++---------- fs/ocfs2/refcounttree.c | 14 +++++++------- fs/ocfs2/xattr.c | 6 +++--- 12 files changed, 57 insertions(+), 51 deletions(-)fs/ocfs2/acl.c +3
-3@@ -191,10 +191,10 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, } inode->i_mode = new_mode; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); di->i_mode =cpu_to_le16 (inode->i_mode); - di->i_ctime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + di->i_ctime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,0 );ocfs2_journal_dirty (handle, di_bh);fs/ocfs2/alloc.c +3
-3@@ -7436,10 +7436,10 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, } inode->i_blocks =ocfs2_inode_sector_count (inode); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); - di->i_ctime = di->i_mtime =cpu_to_le64 (inode->i_ctime.tv_sec); - di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + di->i_ctime = di->i_mtime =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec);ocfs2_update_inode_fsync_trans (handle, inode,1 );ocfs2_journal_dirty (handle, di_bh);fs/ocfs2/aops.c +1
-1@@ -2048,7 +2048,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, } inode->i_blocks =ocfs2_inode_sector_count (inode); di->i_size =cpu_to_le64 ((u64 )i_size_read (inode)); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec);if (handle)fs/ocfs2/dir.c +4
-4@@ -1658,7 +1658,7 @@ int __ocfs2_add_entry(handle_t *handle, offset, ocfs2_dir_trailer_blk_off(dir->i_sb));if (ocfs2_dirent_would_fit (de, rec_len)) { - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); retval =ocfs2_mark_inode_dirty (handle, dir, parent_fe_bh);if (retval <0 ) {mlog_errno (retval);@@ -2962,11 +2962,11 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,ocfs2_dinode_new_extent_list (dir, di);i_size_write (dir, sb->s_blocksize); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); di->i_size =cpu_to_le64 (sb->s_blocksize); - di->i_ctime = di->i_mtime =cpu_to_le64 (dir->i_ctime.tv_sec); - di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (dir->i_ctime.tv_nsec); + di->i_ctime = di->i_mtime =cpu_to_le64 (inode_get_ctime (dir).tv_sec); + di->i_ctime_nsec = di->i_mtime_nsec =cpu_to_le32 (inode_get_ctime (dir).tv_nsec);ocfs2_update_inode_fsync_trans (handle, dir,1 );/* fs/ocfs2/dlmfs/dlmfs.c +2
-2@@ -337,7 +337,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)if (inode) { inode->i_ino =get_next_ino ();inode_init_owner (&nop_mnt_idmap, inode,NULL , mode); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);inc_nlink (inode); inode->i_fop = &simple_dir_operations;@@ -360,7 +360,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent, inode->i_ino =get_next_ino ();inode_init_owner (&nop_mnt_idmap, inode, parent, mode); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); ip =DLMFS_I (inode); ip->ip_conn =DLMFS_I (parent)->ip_conn;fs/ocfs2/dlmglue.c +3
-1@@ -2162,6 +2162,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)struct ocfs2_inode_info *oi =OCFS2_I (inode);struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;struct ocfs2_meta_lvb *lvb; +struct timespec64 ctime =inode_get_ctime (inode); lvb =ocfs2_dlm_lvb (&lockres->l_lksb);@@ -2185,7 +2186,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode) lvb->lvb_iatime_packed =cpu_to_be64 (ocfs2_pack_timespec (&inode->i_atime)); lvb->lvb_ictime_packed = -cpu_to_be64 (ocfs2_pack_timespec (&inode->i_ctime)); +cpu_to_be64 (ocfs2_pack_timespec (&ctime)); lvb->lvb_imtime_packed =cpu_to_be64 (ocfs2_pack_timespec (&inode->i_mtime)); lvb->lvb_iattr =cpu_to_be32 (oi->ip_attr);@@ -2208,6 +2209,7 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode)struct ocfs2_inode_info *oi =OCFS2_I (inode);struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;struct ocfs2_meta_lvb *lvb; +struct timespec64 ctime;mlog_meta_lvb (0 , lockres);Quoted 11 lines
fs/ocfs2/dlmglue.c static int ocfs2_refresh_inode_from_lvb(struct inode *inode) · line 2245
Quoted 8 lines
fs/ocfs2/dlmglue.c +2
-1@@ -2238,8 +2240,9 @@ static int ocfs2_refresh_inode_from_lvb(struct inode *inode) be64_to_cpu(lvb->lvb_iatime_packed));ocfs2_unpack_timespec (&inode->i_mtime,be64_to_cpu (lvb->lvb_imtime_packed)); -ocfs2_unpack_timespec (&inode->i_ctime, +ocfs2_unpack_timespec (&ctime,be64_to_cpu (lvb->lvb_ictime_packed)); +inode_set_ctime_to_ts (inode, ctime);A quick glance, it seems not an equivalent replace.
Quoted 6 lines
How so?
The old code unpacked the time directly into the
inode->i_ctime. The new one unpacks it into a local timespec64 variable and then sets theinode->i_ctimeto that value. The result should still be the same.
IC, it looks fine to me.
Jeff Layton
maintainerPATCH v2 63/92 omfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/omfs/dir.c | 4 ++-- fs/omfs/inode.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-)
fs/omfs/dir.c +2 -2
@@ -143,7 +143,7 @@ static int omfs_add_link(struct dentry *dentry, struct inode *inode)mark_buffer_dirty (bh);brelse (bh); - dir->i_ctime =current_time (dir); +inode_set_ctime_current (dir);/* mark affected inodes dirty to rebuild checksums */ mark_inode_dirty (dir);
@@ -399,7 +399,7 @@ static int omfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (err) goto out; - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);mark_inode_dirty (old_inode); out:return err;
fs/omfs/inode.c +4 -5
@@ -51,7 +51,7 @@ struct inode *omfs_new_inode(struct inode *dir, umode_t mode)inode_init_owner (&nop_mnt_idmap, inode,NULL , mode); inode->i_mapping->a_ops = &omfs_aops; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {case S_IFDIR : inode->i_op = &omfs_dir_inops;
@@ -134,8 +134,8 @@ static int __omfs_write_inode(struct inode *inode, int wait) oi->i_head.h_magic =OMFS_IMAGIC ; oi->i_size =cpu_to_be64 (inode->i_size); - ctime = inode->i_ctime.tv_sec *1000LL + - ((inode->i_ctime.tv_nsec +999 )/1000 ); + ctime =inode_get_ctime (inode).tv_sec *1000LL + + ((inode_get_ctime (inode).tv_nsec +999 )/1000 ); oi->i_ctime =cpu_to_be64 (ctime);omfs_update_checksums (oi);
@@ -232,10 +232,9 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino) inode->i_atime.tv_sec = ctime; inode->i_mtime.tv_sec = ctime; - inode->i_ctime.tv_sec = ctime; +inode_set_ctime (inode, ctime, nsecs); inode->i_atime.tv_nsec = nsecs; inode->i_mtime.tv_nsec = nsecs; - inode->i_ctime.tv_nsec = nsecs; inode->i_mapping->a_ops = &omfs_aops;
Signature · 1 line
2.41.0
Re: [PATCH v2 63/92] omfs: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Bob Copeland <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 66 lines
--- fs/omfs/dir.c | 4 ++-- fs/omfs/inode.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-)fs/omfs/dir.c +2
-2@@ -143,7 +143,7 @@ static int omfs_add_link(struct dentry *dentry, struct inode *inode)mark_buffer_dirty (bh);brelse (bh); - dir->i_ctime =current_time (dir); +inode_set_ctime_current (dir);/* mark affected inodes dirty to rebuild checksums */ mark_inode_dirty (dir);@@ -399,7 +399,7 @@ static int omfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (err) goto out; - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);mark_inode_dirty (old_inode); out:return err;fs/omfs/inode.c +4
-5@@ -51,7 +51,7 @@ struct inode *omfs_new_inode(struct inode *dir, umode_t mode)inode_init_owner (&nop_mnt_idmap, inode,NULL , mode); inode->i_mapping->a_ops = &omfs_aops; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {case S_IFDIR : inode->i_op = &omfs_dir_inops;@@ -134,8 +134,8 @@ static int __omfs_write_inode(struct inode *inode, int wait) oi->i_head.h_magic =OMFS_IMAGIC ; oi->i_size =cpu_to_be64 (inode->i_size); - ctime = inode->i_ctime.tv_sec *1000LL + - ((inode->i_ctime.tv_nsec +999 )/1000 ); + ctime =inode_get_ctime (inode).tv_sec *1000LL + + ((inode_get_ctime (inode).tv_nsec +999 )/1000 ); oi->i_ctime =cpu_to_be64 (ctime);omfs_update_checksums (oi);@@ -232,10 +232,9 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino) inode->i_atime.tv_sec = ctime; inode->i_mtime.tv_sec = ctime; - inode->i_ctime.tv_sec = ctime; +inode_set_ctime (inode, ctime, nsecs); inode->i_atime.tv_nsec = nsecs; inode->i_mtime.tv_nsec = nsecs; - inode->i_ctime.tv_nsec = nsecs; inode->i_mapping->a_ops = &omfs_aops;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 64/92 openpromfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/openpromfs/inode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/openpromfs/inode.c +2 -3
@@ -237,7 +237,7 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentryif (IS_ERR (inode))return ERR_CAST (inode);if (inode->i_state &I_NEW ) { - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); ent_oi =OP_I (inode); ent_oi->type = ent_type; ent_oi->u = ent_data;
@@ -387,8 +387,7 @@ static int openprom_fill_super(struct super_block *s, struct fs_context *fc) goto out_no_root; } - root_inode->i_mtime = root_inode->i_atime = - root_inode->i_ctime =current_time (root_inode); + root_inode->i_mtime = root_inode->i_atime =inode_set_ctime_current (root_inode); root_inode->i_op = &openprom_inode_operations; root_inode->i_fop = &openprom_operations; root_inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;
Signature · 1 line
2.41.0
Re: [PATCH v2 64/92] openpromfs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 30 lines
--- fs/openpromfs/inode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)fs/openpromfs/inode.c +2
-3@@ -237,7 +237,7 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentryif (IS_ERR (inode))return ERR_CAST (inode);if (inode->i_state &I_NEW ) { - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); ent_oi =OP_I (inode); ent_oi->type = ent_type; ent_oi->u = ent_data;@@ -387,8 +387,7 @@ static int openprom_fill_super(struct super_block *s, struct fs_context *fc) goto out_no_root; } - root_inode->i_mtime = root_inode->i_atime = - root_inode->i_ctime =current_time (root_inode); + root_inode->i_mtime = root_inode->i_atime =inode_set_ctime_current (root_inode); root_inode->i_op = &openprom_inode_operations; root_inode->i_fop = &openprom_operations; root_inode->i_mode =S_IFDIR |S_IRUGO |S_IXUGO ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 65/92 orangefs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/orangefs/namei.c | 2 +- fs/orangefs/orangefs-utils.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/orangefs/namei.c +1 -1
@@ -421,7 +421,7 @@ static int orangefs_rename(struct mnt_idmap *idmap, ret);if (new_dentry->d_inode) - new_dentry->d_inode->i_ctime =current_time (new_dentry->d_inode); +inode_set_ctime_current (d_inode (new_dentry));op_release (new_op);return ret;
fs/orangefs/orangefs-utils.c +3 -3
@@ -361,11 +361,11 @@ int orangefs_inode_getattr(struct inode *inode, int flags) downcall.resp.getattr.attributes.atime; inode->i_mtime.tv_sec = (time64_t )new_op-> downcall.resp.getattr.attributes.mtime; - inode->i_ctime.tv_sec = (time64_t )new_op-> - downcall.resp.getattr.attributes.ctime; +inode_set_ctime (inode, + (time64_t )new_op->downcall.resp.getattr.attributes.ctime, +0 ); inode->i_atime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ;/* special case: mark the root inode as sticky */ inode->i_mode = type | (is_root_handle(inode) ? S_ISVTX : 0) |
Signature · 1 line
2.41.0
Re: [PATCH v2 65/92] orangefs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 40 lines
--- fs/orangefs/namei.c | 2 +- fs/orangefs/orangefs-utils.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)fs/orangefs/namei.c +1
-1@@ -421,7 +421,7 @@ static int orangefs_rename(struct mnt_idmap *idmap, ret);if (new_dentry->d_inode) - new_dentry->d_inode->i_ctime =current_time (new_dentry->d_inode); +inode_set_ctime_current (d_inode (new_dentry));op_release (new_op);return ret;fs/orangefs/orangefs-utils.c +3
-3@@ -361,11 +361,11 @@ int orangefs_inode_getattr(struct inode *inode, int flags) downcall.resp.getattr.attributes.atime; inode->i_mtime.tv_sec = (time64_t )new_op-> downcall.resp.getattr.attributes.mtime; - inode->i_ctime.tv_sec = (time64_t )new_op-> - downcall.resp.getattr.attributes.ctime; +inode_set_ctime (inode, + (time64_t )new_op->downcall.resp.getattr.attributes.ctime, +0 ); inode->i_atime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ;/* special case: mark the root inode as sticky */ inode->i_mode = type | (is_root_handle(inode) ? S_ISVTX : 0) |Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v2 65/92] orangefs: convert to ctime accessor functions
In reply to Jeff LaytonQuoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 40 lines
--- fs/orangefs/namei.c | 2 +- fs/orangefs/orangefs-utils.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)fs/orangefs/namei.c +1
-1@@ -421,7 +421,7 @@ static int orangefs_rename(struct mnt_idmap *idmap, ret);if (new_dentry->d_inode) - new_dentry->d_inode->i_ctime =current_time (new_dentry->d_inode); +inode_set_ctime_current (d_inode (new_dentry));op_release (new_op);return ret;fs/orangefs/orangefs-utils.c +3
-3@@ -361,11 +361,11 @@ int orangefs_inode_getattr(struct inode *inode, int flags) downcall.resp.getattr.attributes.atime; inode->i_mtime.tv_sec = (time64_t )new_op-> downcall.resp.getattr.attributes.mtime; - inode->i_ctime.tv_sec = (time64_t )new_op-> - downcall.resp.getattr.attributes.ctime; +inode_set_ctime (inode, + (time64_t )new_op->downcall.resp.getattr.attributes.ctime, +0 ); inode->i_atime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ;/* special case: mark the root inode as sticky */ inode->i_mode = type | (is_root_handle(inode) ? S_ISVTX : 0) |Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 66/92 overlayfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/overlayfs/file.c | 7 +++++-- fs/overlayfs/util.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
fs/overlayfs/file.c +5 -2
@@ -239,6 +239,7 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)static void ovl_file_accessed (struct file *file) {struct inode *inode, *upperinode; +struct timespec64 ctime, uctime;if (file->f_flags &O_NOATIME )return ;
@@ -249,10 +250,12 @@ static void ovl_file_accessed(struct file *file)if (!upperinode)return ; + ctime =inode_get_ctime (inode); + uctime =inode_get_ctime (upperinode);if ((!timespec64_equal (&inode->i_mtime, &upperinode->i_mtime) || - !timespec64_equal (&inode->i_ctime, &upperinode->i_ctime))) { + !timespec64_equal (&ctime, &uctime))) { inode->i_mtime = upperinode->i_mtime; - inode->i_ctime = upperinode->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (upperinode)); }touch_atime (&file->f_path);
fs/overlayfs/util.c +1 -1
@@ -1202,6 +1202,6 @@ void ovl_copyattr(struct inode *inode) inode->i_mode = realinode->i_mode; inode->i_atime = realinode->i_atime; inode->i_mtime = realinode->i_mtime; - inode->i_ctime = realinode->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (realinode));i_size_write (inode,i_size_read (realinode)); }
Signature · 1 line
2.41.0
Re: [PATCH v2 66/92] overlayfs: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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.Reviewed-by Amir Goldstein <[email protected]>Signed-off-by Jeff Layton <[email protected]>
...
Quoted 4 lines
fs/overlayfs/file.c +0
-0
...
fs/overlayfs/file.c static void ovl_file_accessed(struct file *file) · line 258
Quoted 12 lines
fs/overlayfs/file.c +4
-2@@ -249,10 +250,12 @@ static void ovl_file_accessed(struct file *file)if (!upperinode)return ; + ctime =inode_get_ctime (inode); + uctime =inode_get_ctime (upperinode);if ((!timespec64_equal (&inode->i_mtime, &upperinode->i_mtime) || - !timespec64_equal (&inode->i_ctime, &upperinode->i_ctime))) { + !timespec64_equal (&ctime, &uctime))) { inode->i_mtime = upperinode->i_mtime; - inode->i_ctime = upperinode->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (upperinode));
I think you can use uctime here instead of inode_get_ctime(upperinode)? Otherwise the patch looks good. Feel free to add:
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerRe: [PATCH v2 66/92] overlayfs: convert to ctime accessor functions
Quoted 29 lines · Jan Kara
Quoted 6 lines · Jeff Layton
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.Reviewed-by Amir Goldstein <[email protected]>Signed-off-by Jeff Layton <[email protected]>...
Quoted 4 lines
fs/overlayfs/file.c +0
-0...
fs/overlayfs/file.c static void ovl_file_accessed(struct file *file) · line 258
Quoted 12 lines
fs/overlayfs/file.c +4
-2@@ -249,10 +250,12 @@ static void ovl_file_accessed(struct file *file)if (!upperinode)return ; + ctime =inode_get_ctime (inode); + uctime =inode_get_ctime (upperinode);if ((!timespec64_equal (&inode->i_mtime, &upperinode->i_mtime) || - !timespec64_equal (&inode->i_ctime, &upperinode->i_ctime))) { + !timespec64_equal (&ctime, &uctime))) { inode->i_mtime = upperinode->i_mtime; - inode->i_ctime = upperinode->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (upperinode));I think you can use uctime here instead of
inode_get_ctime(upperinode)? Otherwise the patch looks good. Feel free to add:
Quoted 2 lines
Reviewed-by Jan Kara <[email protected]>
Thanks, fixed in tree.
Signature · 1 line
Jeff Layton <[email protected]>
Jeff Layton
maintainerPATCH v2 67/92 procfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/proc/base.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/proc_sysctl.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
fs/proc/base.c +1 -1
@@ -1902,7 +1902,7 @@ struct inode *proc_pid_make_inode(struct super_block *sb, ei =PROC_I (inode); inode->i_mode = mode; inode->i_ino =get_next_ino (); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_op = &proc_def_inode_operations;/*
fs/proc/inode.c +1 -1
@@ -660,7 +660,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) inode->i_private = de->data; inode->i_ino = de->low_ino; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode);PROC_I (inode)->pde = de;if (is_empty_pde (de)) {make_empty_dir_inode (inode);
fs/proc/proc_sysctl.c +1 -1
@@ -463,7 +463,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, head->count++;spin_unlock (&sysctl_lock); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode = table->mode;if (!S_ISDIR (table->mode)) { inode->i_mode |=S_IFREG ;
fs/proc/self.c +1 -1
@@ -46,7 +46,7 @@ int proc_setup_self(struct super_block *s)struct inode *inode =new_inode (s);if (inode) { inode->i_ino = self_inum; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode =S_IFLNK |S_IRWXUGO ; inode->i_uid =GLOBAL_ROOT_UID ; inode->i_gid =GLOBAL_ROOT_GID ;
fs/proc/thread_self.c +1 -1
@@ -46,7 +46,7 @@ int proc_setup_thread_self(struct super_block *s)struct inode *inode =new_inode (s);if (inode) { inode->i_ino = thread_self_inum; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode =S_IFLNK |S_IRWXUGO ; inode->i_uid =GLOBAL_ROOT_UID ; inode->i_gid =GLOBAL_ROOT_GID ;
Signature · 1 line
2.41.0
Re: [PATCH v2 67/92] procfs: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Luis Chamberlain <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 76 lines
--- fs/proc/base.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/proc_sysctl.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)fs/proc/base.c +1
-1@@ -1902,7 +1902,7 @@ struct inode *proc_pid_make_inode(struct super_block *sb, ei =PROC_I (inode); inode->i_mode = mode; inode->i_ino =get_next_ino (); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_op = &proc_def_inode_operations;/* fs/proc/inode.c +1
-1@@ -660,7 +660,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) inode->i_private = de->data; inode->i_ino = de->low_ino; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode);PROC_I (inode)->pde = de;if (is_empty_pde (de)) {make_empty_dir_inode (inode);fs/proc/proc_sysctl.c +1
-1@@ -463,7 +463,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, head->count++;spin_unlock (&sysctl_lock); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode = table->mode;if (!S_ISDIR (table->mode)) { inode->i_mode |=S_IFREG ;fs/proc/self.c +1
-1@@ -46,7 +46,7 @@ int proc_setup_self(struct super_block *s)struct inode *inode =new_inode (s);if (inode) { inode->i_ino = self_inum; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode =S_IFLNK |S_IRWXUGO ; inode->i_uid =GLOBAL_ROOT_UID ; inode->i_gid =GLOBAL_ROOT_GID ;fs/proc/thread_self.c +1
-1@@ -46,7 +46,7 @@ int proc_setup_thread_self(struct super_block *s)struct inode *inode =new_inode (s);if (inode) { inode->i_ino = thread_self_inum; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mode =S_IFLNK |S_IRWXUGO ; inode->i_uid =GLOBAL_ROOT_UID ; inode->i_gid =GLOBAL_ROOT_GID ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 68/92 pstore: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/pstore/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/pstore/inode.c +2 -2
@@ -223,7 +223,7 @@ static struct inode *pstore_get_inode(struct super_block *sb)struct inode *inode =new_inode (sb);if (inode) { inode->i_ino =get_next_ino (); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); }return inode; }
@@ -390,7 +390,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) inode->i_private = private;if (record->time.tv_sec) - inode->i_mtime = inode->i_ctime = record->time; + inode->i_mtime =inode_set_ctime_to_ts (inode, record->time);d_add (dentry, inode);
Signature · 1 line
2.41.0
Re: [PATCH v2 68/92] pstore: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Kees Cook <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good to me. Feel free to add:
Honza
Quoted 29 lines
--- fs/pstore/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/pstore/inode.c +2
-2@@ -223,7 +223,7 @@ static struct inode *pstore_get_inode(struct super_block *sb)struct inode *inode =new_inode (sb);if (inode) { inode->i_ino =get_next_ino (); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); }return inode; }@@ -390,7 +390,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) inode->i_private = private;if (record->time.tv_sec) - inode->i_mtime = inode->i_ctime = record->time; + inode->i_mtime =inode_set_ctime_to_ts (inode, record->time);d_add (dentry, inode);Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 69/92 qnx4: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/qnx4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/qnx4/inode.c +1 -2
@@ -305,8 +305,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino) inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_sec =le32_to_cpu (raw_inode->di_atime); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_sec =le32_to_cpu (raw_inode->di_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,le32_to_cpu (raw_inode->di_ctime),0 ); inode->i_blocks =le32_to_cpu (raw_inode->di_first_xtnt.xtnt_size);memcpy (qnx4_inode, raw_inode,QNX4_DIR_ENTRY_SIZE );
Signature · 1 line
2.41.0
Re: [PATCH v2 69/92] qnx4: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Anders Larsen <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 21 lines
--- fs/qnx4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/qnx4/inode.c +1
-2@@ -305,8 +305,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino) inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_sec =le32_to_cpu (raw_inode->di_atime); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_sec =le32_to_cpu (raw_inode->di_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,le32_to_cpu (raw_inode->di_ctime),0 ); inode->i_blocks =le32_to_cpu (raw_inode->di_first_xtnt.xtnt_size);memcpy (qnx4_inode, raw_inode,QNX4_DIR_ENTRY_SIZE );Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 70/92 qnx6: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/qnx6/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/qnx6/inode.c +1 -2
@@ -562,8 +562,7 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino) inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_sec =fs32_to_cpu (sbi, raw_inode->di_atime); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_sec =fs32_to_cpu (sbi, raw_inode->di_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,fs32_to_cpu (sbi, raw_inode->di_ctime),0 );/* calc blocks based on 512 byte blocksize */ inode->i_blocks = (inode->i_size +511 ) >>9 ;
Signature · 1 line
2.41.0
Re: [PATCH v2 70/92] qnx6: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 21 lines
--- fs/qnx6/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/qnx6/inode.c +1
-2@@ -562,8 +562,7 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino) inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_sec =fs32_to_cpu (sbi, raw_inode->di_atime); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_sec =fs32_to_cpu (sbi, raw_inode->di_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,fs32_to_cpu (sbi, raw_inode->di_ctime),0 );/* calc blocks based on 512 byte blocksize */ inode->i_blocks = (inode->i_size +511 ) >>9 ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 71/92 ramfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/ramfs/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ramfs/inode.c +3 -3
@@ -65,7 +65,7 @@ struct inode *ramfs_get_inode(struct super_block *sb, inode->i_mapping->a_ops = &ram_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_HIGHUSER );mapping_set_unevictable (inode->i_mapping); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {default :init_special_inode (inode, mode, dev);
@@ -105,7 +105,7 @@ ramfs_mknod(struct mnt_idmap *idmap, struct inode *dir,d_instantiate (dentry, inode);dget (dentry);/* Extra count - pin the dentry in core */ error =0 ; - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); }return error; }
@@ -138,7 +138,7 @@ static int ramfs_symlink(struct mnt_idmap *idmap, struct inode *dir,if (!error) {d_instantiate (dentry, inode);dget (dentry); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); }else iput (inode); }
Signature · 1 line
2.41.0
Re: [PATCH v2 71/92] ramfs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 38 lines
--- fs/ramfs/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/ramfs/inode.c +3
-3@@ -65,7 +65,7 @@ struct inode *ramfs_get_inode(struct super_block *sb, inode->i_mapping->a_ops = &ram_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_HIGHUSER );mapping_set_unevictable (inode->i_mapping); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {default :init_special_inode (inode, mode, dev);@@ -105,7 +105,7 @@ ramfs_mknod(struct mnt_idmap *idmap, struct inode *dir,d_instantiate (dentry, inode);dget (dentry);/* Extra count - pin the dentry in core */ error =0 ; - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); }return error; }@@ -138,7 +138,7 @@ static int ramfs_symlink(struct mnt_idmap *idmap, struct inode *dir,if (!error) {d_instantiate (dentry, inode);dget (dentry); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); }else iput (inode); }Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 72/92 reiserfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/reiserfs/inode.c | 12 +++++------- fs/reiserfs/ioctl.c | 4 ++-- fs/reiserfs/namei.c | 11 ++++++----- fs/reiserfs/stree.c | 4 ++-- fs/reiserfs/super.c | 2 +- fs/reiserfs/xattr.c | 5 +++-- fs/reiserfs/xattr_acl.c | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)
fs/reiserfs/inode.c +5 -7
@@ -1259,9 +1259,8 @@ static void init_inode(struct inode *inode, struct treepath *path) inode->i_size =sd_v1_size (sd); inode->i_atime.tv_sec =sd_v1_atime (sd); inode->i_mtime.tv_sec =sd_v1_mtime (sd); - inode->i_ctime.tv_sec =sd_v1_ctime (sd); +inode_set_ctime (inode,sd_v1_ctime (sd),0 ); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; inode->i_blocks =sd_v1_blocks (sd);
@@ -1314,8 +1313,7 @@ static void init_inode(struct inode *inode, struct treepath *path)i_gid_write (inode,sd_v2_gid (sd)); inode->i_mtime.tv_sec =sd_v2_mtime (sd); inode->i_atime.tv_sec =sd_v2_atime (sd); - inode->i_ctime.tv_sec =sd_v2_ctime (sd); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,sd_v2_ctime (sd),0 ); inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_nsec =0 ; inode->i_blocks =sd_v2_blocks (sd);
@@ -1374,7 +1372,7 @@ static void inode2sd(void *sd, struct inode *inode, loff_t size)set_sd_v2_gid (sd_v2,i_gid_read (inode));set_sd_v2_mtime (sd_v2, inode->i_mtime.tv_sec);set_sd_v2_atime (sd_v2, inode->i_atime.tv_sec); -set_sd_v2_ctime (sd_v2, inode->i_ctime.tv_sec); +set_sd_v2_ctime (sd_v2,inode_get_ctime (inode).tv_sec);set_sd_v2_blocks (sd_v2,to_fake_used_blocks (inode,SD_V2_SIZE ));if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))set_sd_v2_rdev (sd_v2,new_encode_dev (inode->i_rdev));
@@ -1394,7 +1392,7 @@ static void inode2sd_v1(void *sd, struct inode *inode, loff_t size)set_sd_v1_nlink (sd_v1, inode->i_nlink);set_sd_v1_size (sd_v1, size);set_sd_v1_atime (sd_v1, inode->i_atime.tv_sec); -set_sd_v1_ctime (sd_v1, inode->i_ctime.tv_sec); +set_sd_v1_ctime (sd_v1,inode_get_ctime (inode).tv_sec);set_sd_v1_mtime (sd_v1, inode->i_mtime.tv_sec);if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))
@@ -1986,7 +1984,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,/* uid and gid must already be set by the caller for quota init */ - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_size = i_size; inode->i_blocks =0 ; inode->i_bytes =0 ;
fs/reiserfs/ioctl.c +2 -2
@@ -55,7 +55,7 @@ int reiserfs_fileattr_set(struct mnt_idmap *idmap, }sd_attrs_to_i_attrs (flags, inode);REISERFS_I (inode)->i_attrs = flags; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); err =0 ; unlock:
@@ -107,7 +107,7 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) err = -EFAULT ; goto setversion_out; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); setversion_out:mnt_drop_write_file (filp);
fs/reiserfs/namei.c +6 -5
@@ -572,7 +572,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, } dir->i_size += paste_size; - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);if (!S_ISDIR (inode->i_mode) && visible)/* reiserfs_mkdir or reiserfs_rename will do that by itself */ reiserfs_update_sd (th, dir);
@@ -966,7 +966,8 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) inode->i_nlink);clear_nlink (inode); - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));reiserfs_update_sd (&th, inode);DEC_DIR_INODE_NLINK (dir)
@@ -1070,11 +1071,11 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)inc_nlink (inode); goto end_unlink; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);reiserfs_update_sd (&th, inode); dir->i_size -= (de.de_entrylen +DEH_SIZE ); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);reiserfs_update_sd (&th, dir);if (!savelink)
@@ -1250,7 +1251,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,return err ? err : retval; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);reiserfs_update_sd (&th, inode);ihold (inode);
fs/reiserfs/stree.c +2 -2
@@ -2004,7 +2004,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,if (update_timestamps) { inode->i_mtime =current_time (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); }reiserfs_update_sd (th, inode);
@@ -2029,7 +2029,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,if (update_timestamps) {/* this is truncate, not file closing */ inode->i_mtime =current_time (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); }reiserfs_update_sd (th, inode);
fs/reiserfs/super.c +1 -1
@@ -2587,7 +2587,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,return err;if (inode->i_size < off + len - towrite)i_size_write (inode, off + len - towrite); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode);return len - towrite; }
fs/reiserfs/xattr.c +3 -2
@@ -466,12 +466,13 @@ int reiserfs_commit_write(struct file *f, struct page *page,static void update_ctime (struct inode *inode) {struct timespec64 now =current_time (inode); +struct timespec64 ctime =inode_get_ctime (inode);if (inode_unhashed (inode) || !inode->i_nlink || -timespec64_equal (&inode->i_ctime, &now)) +timespec64_equal (&ctime, &now))return ; - inode->i_ctime =current_time (inode); +inode_set_ctime_to_ts (inode, now);mark_inode_dirty (inode); }
fs/reiserfs/xattr_acl.c +1 -1
@@ -285,7 +285,7 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,if (error == -ENODATA ) { error =0 ;if (type ==ACL_TYPE_ACCESS ) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); } }
Signature · 1 line
2.41.0
Re: [PATCH v2 72/92] reiserfs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 201 lines
--- fs/reiserfs/inode.c | 12 +++++------- fs/reiserfs/ioctl.c | 4 ++-- fs/reiserfs/namei.c | 11 ++++++----- fs/reiserfs/stree.c | 4 ++-- fs/reiserfs/super.c | 2 +- fs/reiserfs/xattr.c | 5 +++-- fs/reiserfs/xattr_acl.c | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)fs/reiserfs/inode.c +5
-7@@ -1259,9 +1259,8 @@ static void init_inode(struct inode *inode, struct treepath *path) inode->i_size =sd_v1_size (sd); inode->i_atime.tv_sec =sd_v1_atime (sd); inode->i_mtime.tv_sec =sd_v1_mtime (sd); - inode->i_ctime.tv_sec =sd_v1_ctime (sd); +inode_set_ctime (inode,sd_v1_ctime (sd),0 ); inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; inode->i_blocks =sd_v1_blocks (sd);@@ -1314,8 +1313,7 @@ static void init_inode(struct inode *inode, struct treepath *path)i_gid_write (inode,sd_v2_gid (sd)); inode->i_mtime.tv_sec =sd_v2_mtime (sd); inode->i_atime.tv_sec =sd_v2_atime (sd); - inode->i_ctime.tv_sec =sd_v2_ctime (sd); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,sd_v2_ctime (sd),0 ); inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_nsec =0 ; inode->i_blocks =sd_v2_blocks (sd);@@ -1374,7 +1372,7 @@ static void inode2sd(void *sd, struct inode *inode, loff_t size)set_sd_v2_gid (sd_v2,i_gid_read (inode));set_sd_v2_mtime (sd_v2, inode->i_mtime.tv_sec);set_sd_v2_atime (sd_v2, inode->i_atime.tv_sec); -set_sd_v2_ctime (sd_v2, inode->i_ctime.tv_sec); +set_sd_v2_ctime (sd_v2,inode_get_ctime (inode).tv_sec);set_sd_v2_blocks (sd_v2,to_fake_used_blocks (inode,SD_V2_SIZE ));if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))set_sd_v2_rdev (sd_v2,new_encode_dev (inode->i_rdev));@@ -1394,7 +1392,7 @@ static void inode2sd_v1(void *sd, struct inode *inode, loff_t size)set_sd_v1_nlink (sd_v1, inode->i_nlink);set_sd_v1_size (sd_v1, size);set_sd_v1_atime (sd_v1, inode->i_atime.tv_sec); -set_sd_v1_ctime (sd_v1, inode->i_ctime.tv_sec); +set_sd_v1_ctime (sd_v1,inode_get_ctime (inode).tv_sec);set_sd_v1_mtime (sd_v1, inode->i_mtime.tv_sec);if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))@@ -1986,7 +1984,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,/* uid and gid must already be set by the caller for quota init */ - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_size = i_size; inode->i_blocks =0 ; inode->i_bytes =0 ;fs/reiserfs/ioctl.c +2
-2@@ -55,7 +55,7 @@ int reiserfs_fileattr_set(struct mnt_idmap *idmap, }sd_attrs_to_i_attrs (flags, inode);REISERFS_I (inode)->i_attrs = flags; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); err =0 ; unlock:@@ -107,7 +107,7 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) err = -EFAULT ; goto setversion_out; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); setversion_out:mnt_drop_write_file (filp);fs/reiserfs/namei.c +6
-5@@ -572,7 +572,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, } dir->i_size += paste_size; - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);if (!S_ISDIR (inode->i_mode) && visible)/* reiserfs_mkdir or reiserfs_rename will do that by itself */ reiserfs_update_sd (th, dir);@@ -966,7 +966,8 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) inode->i_nlink);clear_nlink (inode); - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));reiserfs_update_sd (&th, inode);DEC_DIR_INODE_NLINK (dir)@@ -1070,11 +1071,11 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)inc_nlink (inode); goto end_unlink; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);reiserfs_update_sd (&th, inode); dir->i_size -= (de.de_entrylen +DEH_SIZE ); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);reiserfs_update_sd (&th, dir);if (!savelink)@@ -1250,7 +1251,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,return err ? err : retval; } - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);reiserfs_update_sd (&th, inode);ihold (inode);fs/reiserfs/stree.c +2
-2@@ -2004,7 +2004,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,if (update_timestamps) { inode->i_mtime =current_time (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); }reiserfs_update_sd (th, inode);@@ -2029,7 +2029,7 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,if (update_timestamps) {/* this is truncate, not file closing */ inode->i_mtime =current_time (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); }reiserfs_update_sd (th, inode);fs/reiserfs/super.c +1
-1@@ -2587,7 +2587,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,return err;if (inode->i_size < off + len - towrite)i_size_write (inode, off + len - towrite); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode);return len - towrite; }fs/reiserfs/xattr.c +3
-2@@ -466,12 +466,13 @@ int reiserfs_commit_write(struct file *f, struct page *page,static void update_ctime (struct inode *inode) {struct timespec64 now =current_time (inode); +struct timespec64 ctime =inode_get_ctime (inode);if (inode_unhashed (inode) || !inode->i_nlink || -timespec64_equal (&inode->i_ctime, &now)) +timespec64_equal (&ctime, &now))return ; - inode->i_ctime =current_time (inode); +inode_set_ctime_to_ts (inode, now);mark_inode_dirty (inode); }fs/reiserfs/xattr_acl.c +1
-1@@ -285,7 +285,7 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,if (error == -ENODATA ) { error =0 ;if (type ==ACL_TYPE_ACCESS ) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); } }Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 73/92 romfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/romfs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/romfs/super.c +2 -2
@@ -322,8 +322,8 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)set_nlink (i,1 );/* Hard to decide.. */ i->i_size =be32_to_cpu (ri.size); - i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec =0 ; - i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec =0 ; + i->i_mtime.tv_sec = i->i_atime.tv_sec =inode_set_ctime (i,0 ,0 ).tv_sec; + i->i_mtime.tv_nsec = i->i_atime.tv_nsec =0 ;/* set up mode and ops */ mode = romfs_modemap[nextfh &ROMFH_TYPE ];
Signature · 1 line
2.41.0
Jan Kara
maintainerRe: [PATCH v2 73/92] romfs: convert to ctime accessor functions
Quoted 11 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>fs/romfs/super.c +0
-0
fs/romfs/super.c static struct inode *romfs_iget(struct super_block *sb, unsigned long pos) · line 326
Quoted 7 lines
fs/romfs/super.c +2
-2@@ -322,8 +322,8 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)set_nlink (i,1 );/* Hard to decide.. */ i->i_size =be32_to_cpu (ri.size); - i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec =0 ; - i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec =0 ; + i->i_mtime.tv_sec = i->i_atime.tv_sec =inode_set_ctime (i,0 ,0 ).tv_sec; + i->i_mtime.tv_nsec = i->i_atime.tv_nsec =0 ;
The usual simplification:
i->i_mtime = i->i_atime = inode_set_ctime(i, 0, 0); Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 74/92 smb: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/smb/client/file.c | 4 ++-- fs/smb/client/fscache.h | 5 +++-- fs/smb/client/inode.c | 14 +++++++------- fs/smb/client/smb2ops.c | 3 ++- fs/smb/server/smb2pdu.c | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-)
fs/smb/client/file.c +2 -2
@@ -1085,7 +1085,7 @@ int cifs_close(struct inode *inode, struct file *file) !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) && dclose) {if (test_and_clear_bit (CIFS_INO_MODIFIED_ATTR , &cinode->flags)) { - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); }spin_lock (&cinode->deferred_lock);cifs_add_deferred_close (cfile, dclose);
@@ -2596,7 +2596,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) write_data, to - from, &offset);cifsFileInfo_put (open_file);/* Does mm or vfs already set times? */ - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);if ((bytes_written >0 ) && (offset)) rc =0 ;else if (bytes_written <0 )
fs/smb/client/fscache.h +3 -2
@@ -50,12 +50,13 @@ void cifs_fscache_fill_coherency(struct inode *inode, struct cifs_fscache_inode_coherency_data *cd) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct timespec64 ctime =inode_get_ctime (inode);memset (cd,0 ,sizeof (*cd)); cd->last_write_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_mtime.tv_sec); cd->last_write_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_mtime.tv_nsec); - cd->last_change_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_ctime.tv_sec); - cd->last_change_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_ctime.tv_nsec); + cd->last_change_time_sec =cpu_to_le64 (ctime.tv_sec); + cd->last_change_time_nsec =cpu_to_le64 (ctime.tv_nsec); }
fs/smb/client/inode.c +7 -7
@@ -172,7 +172,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)else inode->i_atime = fattr->cf_atime; inode->i_mtime = fattr->cf_mtime; - inode->i_ctime = fattr->cf_ctime; +inode_set_ctime_to_ts (inode, fattr->cf_ctime); inode->i_rdev = fattr->cf_rdev;cifs_nlink_fattr_to_inode (inode, fattr); inode->i_uid = fattr->cf_uid;
@@ -1744,9 +1744,9 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) cifs_inode =CIFS_I (inode); cifs_inode->time =0 ;/* will force revalidate to get info when needed */ - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); } - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); cifs_inode =CIFS_I (dir);CIFS_I (dir)->time =0 ;/* force revalidate of dir as well */ unlink_out:
@@ -2060,8 +2060,8 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)*/ cifsInode->time =0 ; -d_inode (direntry)->i_ctime = inode->i_ctime = inode->i_mtime = -current_time (inode); +inode_set_ctime_current (d_inode (direntry)); + inode->i_mtime =inode_set_ctime_current (inode); rmdir_exit:free_dentry_path (page);
@@ -2267,8 +2267,8 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,/* force revalidate to go get info when needed */ CIFS_I (source_dir)->time =CIFS_I (target_dir)->time =0 ; - source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime = - target_dir->i_mtime =current_time (source_dir); + source_dir->i_mtime = target_dir->i_mtime =inode_set_ctime_to_ts (source_dir, +inode_set_ctime_current (target_dir)); cifs_rename_exit:kfree (info_buf_source);
fs/smb/client/smb2ops.c +2 -1
@@ -1396,7 +1396,8 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,if (file_inf.LastWriteTime) inode->i_mtime =cifs_NTtimeToUnix (file_inf.LastWriteTime);if (file_inf.ChangeTime) - inode->i_ctime =cifs_NTtimeToUnix (file_inf.ChangeTime); +inode_set_ctime_to_ts (inode, +cifs_NTtimeToUnix (file_inf.ChangeTime));if (file_inf.LastAccessTime) inode->i_atime =cifs_NTtimeToUnix (file_inf.LastAccessTime);
fs/smb/server/smb2pdu.c +4 -4
@@ -4779,7 +4779,7 @@ static int find_file_posix_info(struct smb2_query_info_rsp *rsp, file_info->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); file_info->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); file_info->ChangeTime =cpu_to_le64 (time); file_info->DosAttributes = fp->f_ci->m_fattr; file_info->Inode =cpu_to_le64 (inode->i_ino);
@@ -5422,7 +5422,7 @@ int smb2_close(struct ksmbd_work *work) rsp->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); rsp->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); rsp->ChangeTime =cpu_to_le64 (time);ksmbd_fd_put (work, fp); }else {
@@ -5644,7 +5644,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,if (file_info->ChangeTime) attrs.ia_ctime =ksmbd_NTtimeToUnix (file_info->ChangeTime);else - attrs.ia_ctime = inode->i_ctime; + attrs.ia_ctime =inode_get_ctime (inode);if (file_info->LastWriteTime) { attrs.ia_mtime =ksmbd_NTtimeToUnix (file_info->LastWriteTime);
@@ -5689,7 +5689,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,return -EACCES ;inode_lock (inode); - inode->i_ctime = attrs.ia_ctime; +inode_set_ctime_to_ts (inode, attrs.ia_ctime); attrs.ia_valid &= ~ATTR_CTIME ; rc =notify_change (idmap, dentry, &attrs,NULL );inode_unlock (inode);
Signature · 1 line
2.41.0
Jeff Layton
maintainerRe: [PATCH v2 74/92] smb: convert to ctime accessor functions
Quoted 44 lines · Jeff Layton
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 Tom Talpey <[email protected]>Reviewed-by Sergey Senozhatsky <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/smb/client/file.c | 4 ++-- fs/smb/client/fscache.h | 5 +++-- fs/smb/client/inode.c | 14 +++++++------- fs/smb/client/smb2ops.c | 3 ++- fs/smb/server/smb2pdu.c | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-)fs/smb/client/file.c +2
-2@@ -1085,7 +1085,7 @@ int cifs_close(struct inode *inode, struct file *file) !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) && dclose) {if (test_and_clear_bit (CIFS_INO_MODIFIED_ATTR , &cinode->flags)) { - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); }spin_lock (&cinode->deferred_lock);cifs_add_deferred_close (cfile, dclose);@@ -2596,7 +2596,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) write_data, to - from, &offset);cifsFileInfo_put (open_file);/* Does mm or vfs already set times? */ - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);if ((bytes_written >0 ) && (offset)) rc =0 ;else if (bytes_written <0 )fs/smb/client/fscache.h +0
-0@@ -50,12 +50,13 @@ void cifs_fscache_fill_coherency(struct inode *inode, struct cifs_fscache_inode_coherency_data *cd) {
fs/smb/client/fscache.h void cifs_fscache_fill_coherency(struct inode *inode, · line 59
Quoted 10 lines
fs/smb/client/fscache.h +3
-2struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct timespec64 ctime =inode_get_ctime (inode);memset (cd,0 ,sizeof (*cd)); cd->last_write_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_mtime.tv_sec); cd->last_write_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_mtime.tv_nsec); - cd->last_change_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_ctime.tv_sec); - cd->last_change_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_ctime.tv_nsec); + cd->last_change_time_sec =cpu_to_le64 (ctime.tv_sec); + cd->last_change_time_nsec =cpu_to_le64 (ctime.tv_nsec);
Tom pointed out that I made a switch to cpu_to_le64 here. That will need to be fixed before we merge this. I've fixed this in my "ctime-next" branch for now (and will collect other fixes there).
Quoted 104 lines
fs/smb/client/fscache.h +0
-0}fs/smb/client/inode.c +7
-7@@ -172,7 +172,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)else inode->i_atime = fattr->cf_atime; inode->i_mtime = fattr->cf_mtime; - inode->i_ctime = fattr->cf_ctime; +inode_set_ctime_to_ts (inode, fattr->cf_ctime); inode->i_rdev = fattr->cf_rdev;cifs_nlink_fattr_to_inode (inode, fattr); inode->i_uid = fattr->cf_uid;@@ -1744,9 +1744,9 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) cifs_inode =CIFS_I (inode); cifs_inode->time =0 ;/* will force revalidate to get info when needed */ - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); } - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); cifs_inode =CIFS_I (dir);CIFS_I (dir)->time =0 ;/* force revalidate of dir as well */ unlink_out:@@ -2060,8 +2060,8 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)*/ cifsInode->time =0 ; -d_inode (direntry)->i_ctime = inode->i_ctime = inode->i_mtime = -current_time (inode); +inode_set_ctime_current (d_inode (direntry)); + inode->i_mtime =inode_set_ctime_current (inode); rmdir_exit:free_dentry_path (page);@@ -2267,8 +2267,8 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,/* force revalidate to go get info when needed */ CIFS_I (source_dir)->time =CIFS_I (target_dir)->time =0 ; - source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime = - target_dir->i_mtime =current_time (source_dir); + source_dir->i_mtime = target_dir->i_mtime =inode_set_ctime_to_ts (source_dir, +inode_set_ctime_current (target_dir)); cifs_rename_exit:kfree (info_buf_source);fs/smb/client/smb2ops.c +2
-1@@ -1396,7 +1396,8 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,if (file_inf.LastWriteTime) inode->i_mtime =cifs_NTtimeToUnix (file_inf.LastWriteTime);if (file_inf.ChangeTime) - inode->i_ctime =cifs_NTtimeToUnix (file_inf.ChangeTime); +inode_set_ctime_to_ts (inode, +cifs_NTtimeToUnix (file_inf.ChangeTime));if (file_inf.LastAccessTime) inode->i_atime =cifs_NTtimeToUnix (file_inf.LastAccessTime);fs/smb/server/smb2pdu.c +4
-4@@ -4779,7 +4779,7 @@ static int find_file_posix_info(struct smb2_query_info_rsp *rsp, file_info->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); file_info->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); file_info->ChangeTime =cpu_to_le64 (time); file_info->DosAttributes = fp->f_ci->m_fattr; file_info->Inode =cpu_to_le64 (inode->i_ino);@@ -5422,7 +5422,7 @@ int smb2_close(struct ksmbd_work *work) rsp->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); rsp->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); rsp->ChangeTime =cpu_to_le64 (time);ksmbd_fd_put (work, fp); }else {@@ -5644,7 +5644,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,if (file_info->ChangeTime) attrs.ia_ctime =ksmbd_NTtimeToUnix (file_info->ChangeTime);else - attrs.ia_ctime = inode->i_ctime; + attrs.ia_ctime =inode_get_ctime (inode);if (file_info->LastWriteTime) { attrs.ia_mtime =ksmbd_NTtimeToUnix (file_info->LastWriteTime);@@ -5689,7 +5689,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,return -EACCES ;inode_lock (inode); - inode->i_ctime = attrs.ia_ctime; +inode_set_ctime_to_ts (inode, attrs.ia_ctime); attrs.ia_valid &= ~ATTR_CTIME ; rc =notify_change (idmap, dentry, &attrs,NULL );inode_unlock (inode);
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v2 74/92] smb: convert to ctime accessor functions
In reply to Jeff LaytonQuoted 162 lines · Jeff Layton
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 Tom Talpey <[email protected]>Reviewed-by Sergey Senozhatsky <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/smb/client/file.c | 4 ++-- fs/smb/client/fscache.h | 5 +++-- fs/smb/client/inode.c | 14 +++++++------- fs/smb/client/smb2ops.c | 3 ++- fs/smb/server/smb2pdu.c | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-)fs/smb/client/file.c +2
-2@@ -1085,7 +1085,7 @@ int cifs_close(struct inode *inode, struct file *file) !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) && dclose) {if (test_and_clear_bit (CIFS_INO_MODIFIED_ATTR , &cinode->flags)) { - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); }spin_lock (&cinode->deferred_lock);cifs_add_deferred_close (cfile, dclose);@@ -2596,7 +2596,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) write_data, to - from, &offset);cifsFileInfo_put (open_file);/* Does mm or vfs already set times? */ - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);if ((bytes_written >0 ) && (offset)) rc =0 ;else if (bytes_written <0 )fs/smb/client/fscache.h +3
-2@@ -50,12 +50,13 @@ void cifs_fscache_fill_coherency(struct inode *inode, struct cifs_fscache_inode_coherency_data *cd) {struct cifsInodeInfo *cifsi =CIFS_I (inode); +struct timespec64 ctime =inode_get_ctime (inode);memset (cd,0 ,sizeof (*cd)); cd->last_write_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_mtime.tv_sec); cd->last_write_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_mtime.tv_nsec); - cd->last_change_time_sec =cpu_to_le64 (cifsi->netfs.inode.i_ctime.tv_sec); - cd->last_change_time_nsec =cpu_to_le32 (cifsi->netfs.inode.i_ctime.tv_nsec); + cd->last_change_time_sec =cpu_to_le64 (ctime.tv_sec); + cd->last_change_time_nsec =cpu_to_le64 (ctime.tv_nsec); }fs/smb/client/inode.c +7
-7@@ -172,7 +172,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)else inode->i_atime = fattr->cf_atime; inode->i_mtime = fattr->cf_mtime; - inode->i_ctime = fattr->cf_ctime; +inode_set_ctime_to_ts (inode, fattr->cf_ctime); inode->i_rdev = fattr->cf_rdev;cifs_nlink_fattr_to_inode (inode, fattr); inode->i_uid = fattr->cf_uid;@@ -1744,9 +1744,9 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) cifs_inode =CIFS_I (inode); cifs_inode->time =0 ;/* will force revalidate to get info when needed */ - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); } - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir); cifs_inode =CIFS_I (dir);CIFS_I (dir)->time =0 ;/* force revalidate of dir as well */ unlink_out:@@ -2060,8 +2060,8 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)*/ cifsInode->time =0 ; -d_inode (direntry)->i_ctime = inode->i_ctime = inode->i_mtime = -current_time (inode); +inode_set_ctime_current (d_inode (direntry)); + inode->i_mtime =inode_set_ctime_current (inode); rmdir_exit:free_dentry_path (page);@@ -2267,8 +2267,8 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,/* force revalidate to go get info when needed */ CIFS_I (source_dir)->time =CIFS_I (target_dir)->time =0 ; - source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime = - target_dir->i_mtime =current_time (source_dir); + source_dir->i_mtime = target_dir->i_mtime =inode_set_ctime_to_ts (source_dir, +inode_set_ctime_current (target_dir)); cifs_rename_exit:kfree (info_buf_source);fs/smb/client/smb2ops.c +2
-1@@ -1396,7 +1396,8 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,if (file_inf.LastWriteTime) inode->i_mtime =cifs_NTtimeToUnix (file_inf.LastWriteTime);if (file_inf.ChangeTime) - inode->i_ctime =cifs_NTtimeToUnix (file_inf.ChangeTime); +inode_set_ctime_to_ts (inode, +cifs_NTtimeToUnix (file_inf.ChangeTime));if (file_inf.LastAccessTime) inode->i_atime =cifs_NTtimeToUnix (file_inf.LastAccessTime);fs/smb/server/smb2pdu.c +4
-5@@ -4779,7 +4779,7 @@ static int find_file_posix_info(struct smb2_query_info_rsp *rsp, file_info->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); file_info->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); file_info->ChangeTime =cpu_to_le64 (time); file_info->DosAttributes = fp->f_ci->m_fattr; file_info->Inode =cpu_to_le64 (inode->i_ino);@@ -5422,7 +5422,7 @@ int smb2_close(struct ksmbd_work *work) rsp->LastAccessTime =cpu_to_le64 (time); time =ksmbd_UnixTimeToNT (inode->i_mtime); rsp->LastWriteTime =cpu_to_le64 (time); - time =ksmbd_UnixTimeToNT (inode->i_ctime); + time =ksmbd_UnixTimeToNT (inode_get_ctime (inode)); rsp->ChangeTime =cpu_to_le64 (time);ksmbd_fd_put (work, fp); }else {@@ -5644,7 +5644,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,if (file_info->ChangeTime) attrs.ia_ctime =ksmbd_NTtimeToUnix (file_info->ChangeTime);else - attrs.ia_ctime = inode->i_ctime; + attrs.ia_ctime =inode_get_ctime (inode);if (file_info->LastWriteTime) { attrs.ia_mtime =ksmbd_NTtimeToUnix (file_info->LastWriteTime);@@ -5689,7 +5689,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,return -EACCES ;inode_lock (inode); - inode->i_ctime = attrs.ia_ctime; +inode_set_ctime_to_ts (inode, attrs.ia_ctime); attrs.ia_valid &= ~ATTR_CTIME ; rc =notify_change (idmap, dentry, &attrs,NULL );inode_unlock (inode); --2.41.0
Signature · 3 lines
Thanks, Steve
Jeff Layton
maintainerPATCH v2 75/92 squashfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/squashfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/squashfs/inode.c +1 -1
@@ -61,7 +61,7 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode, inode->i_ino =le32_to_cpu (sqsh_ino->inode_number); inode->i_mtime.tv_sec =le32_to_cpu (sqsh_ino->mtime); inode->i_atime.tv_sec = inode->i_mtime.tv_sec; - inode->i_ctime.tv_sec = inode->i_mtime.tv_sec; +inode_set_ctime (inode, inode->i_mtime.tv_sec,0 ); inode->i_mode =le16_to_cpu (sqsh_ino->mode); inode->i_size =0 ;
Signature · 1 line
2.41.0
Re: [PATCH v2 75/92] squashfs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- fs/squashfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/squashfs/inode.c +1
-1@@ -61,7 +61,7 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode, inode->i_ino =le32_to_cpu (sqsh_ino->inode_number); inode->i_mtime.tv_sec =le32_to_cpu (sqsh_ino->mtime); inode->i_atime.tv_sec = inode->i_mtime.tv_sec; - inode->i_ctime.tv_sec = inode->i_mtime.tv_sec; +inode_set_ctime (inode, inode->i_mtime.tv_sec,0 ); inode->i_mode =le16_to_cpu (sqsh_ino->mode); inode->i_size =0 ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 76/92 sysv: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/sysv/dir.c | 6 +++--- fs/sysv/ialloc.c | 2 +- fs/sysv/inode.c | 5 ++--- fs/sysv/itree.c | 4 ++-- fs/sysv/namei.c | 6 +++--- 5 files changed, 11 insertions(+), 12 deletions(-)
fs/sysv/dir.c +3 -3
@@ -224,7 +224,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)memset (de->name + namelen,0 ,SYSV_DIRSIZE - namelen -2 ); de->inode =cpu_to_fs16 (SYSV_SB (inode->i_sb), inode->i_ino);dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir); err =sysv_handle_dirsync (dir); out_page:
@@ -249,7 +249,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page) } de->inode =0 ;dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode);return sysv_handle_dirsync (inode); }
@@ -346,7 +346,7 @@ int sysv_set_link(struct sysv_dir_entry *de, struct page *page, } de->inode =cpu_to_fs16 (SYSV_SB (inode->i_sb), inode->i_ino);dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);return sysv_handle_dirsync (inode); }
fs/sysv/ialloc.c +1 -1
@@ -165,7 +165,7 @@ struct inode * sysv_new_inode(const struct inode * dir, umode_t mode)dirty_sb (sb);inode_init_owner (&nop_mnt_idmap, inode, dir, mode); inode->i_ino =fs16_to_cpu (sbi, ino); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_blocks =0 ;memset (SYSV_I (inode)->i_data,0 ,sizeof (SYSV_I (inode)->i_data));SYSV_I (inode)->i_dir_start_lookup =0 ;
fs/sysv/inode.c +2 -3
@@ -202,8 +202,7 @@ struct inode *sysv_iget(struct super_block *sb, unsigned int ino) inode->i_size =fs32_to_cpu (sbi, raw_inode->i_size); inode->i_atime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_atime); inode->i_mtime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_mtime); - inode->i_ctime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,fs32_to_cpu (sbi, raw_inode->i_ctime),0 ); inode->i_atime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; inode->i_blocks =0 ;
@@ -256,7 +255,7 @@ static int __sysv_write_inode(struct inode *inode, int wait) raw_inode->i_size =cpu_to_fs32 (sbi, inode->i_size); raw_inode->i_atime =cpu_to_fs32 (sbi, inode->i_atime.tv_sec); raw_inode->i_mtime =cpu_to_fs32 (sbi, inode->i_mtime.tv_sec); - raw_inode->i_ctime =cpu_to_fs32 (sbi, inode->i_ctime.tv_sec); + raw_inode->i_ctime =cpu_to_fs32 (sbi,inode_get_ctime (inode).tv_sec); si =SYSV_I (inode);if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))
fs/sysv/itree.c +2 -2
@@ -183,7 +183,7 @@ static inline int splice_branch(struct inode *inode, *where->p = where->key;write_unlock (&pointers_lock); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);/* had we spliced it onto indirect block? */ if (where->bh)
@@ -423,7 +423,7 @@ void sysv_truncate (struct inode * inode) } n++; } - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);if (IS_SYNC (inode))sysv_sync_inode (inode);else
fs/sysv/namei.c +3 -3
@@ -103,7 +103,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir, {struct inode *inode =d_inode (old_dentry); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_link_count (inode);ihold (inode);
@@ -161,7 +161,7 @@ static int sysv_unlink(struct inode * dir, struct dentry * dentry) err =sysv_delete_entry (de, page);if (!err) { - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir));inode_dec_link_count (inode); }unmap_and_put_page (page, de);
@@ -230,7 +230,7 @@ static int sysv_rename(struct mnt_idmap *idmap, struct inode *old_dir,unmap_and_put_page (new_page, new_de);if (err) goto out_dir; - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);if (dir_de)drop_nlink (new_inode);inode_dec_link_count (new_inode);
Signature · 1 line
2.41.0
Re: [PATCH v2 76/92] sysv: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 131 lines
--- fs/sysv/dir.c | 6 +++--- fs/sysv/ialloc.c | 2 +- fs/sysv/inode.c | 5 ++--- fs/sysv/itree.c | 4 ++-- fs/sysv/namei.c | 6 +++--- 5 files changed, 11 insertions(+), 12 deletions(-)fs/sysv/dir.c +3
-3@@ -224,7 +224,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)memset (de->name + namelen,0 ,SYSV_DIRSIZE - namelen -2 ); de->inode =cpu_to_fs16 (SYSV_SB (inode->i_sb), inode->i_ino);dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir); err =sysv_handle_dirsync (dir); out_page:@@ -249,7 +249,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page) } de->inode =0 ;dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode);return sysv_handle_dirsync (inode); }@@ -346,7 +346,7 @@ int sysv_set_link(struct sysv_dir_entry *de, struct page *page, } de->inode =cpu_to_fs16 (SYSV_SB (inode->i_sb), inode->i_ino);dir_commit_chunk (page, pos,SYSV_DIRSIZE ); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);return sysv_handle_dirsync (inode); }fs/sysv/ialloc.c +1
-1@@ -165,7 +165,7 @@ struct inode * sysv_new_inode(const struct inode * dir, umode_t mode)dirty_sb (sb);inode_init_owner (&nop_mnt_idmap, inode, dir, mode); inode->i_ino =fs16_to_cpu (sbi, ino); - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_blocks =0 ;memset (SYSV_I (inode)->i_data,0 ,sizeof (SYSV_I (inode)->i_data));SYSV_I (inode)->i_dir_start_lookup =0 ;fs/sysv/inode.c +2
-3@@ -202,8 +202,7 @@ struct inode *sysv_iget(struct super_block *sb, unsigned int ino) inode->i_size =fs32_to_cpu (sbi, raw_inode->i_size); inode->i_atime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_atime); inode->i_mtime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_mtime); - inode->i_ctime.tv_sec =fs32_to_cpu (sbi, raw_inode->i_ctime); - inode->i_ctime.tv_nsec =0 ; +inode_set_ctime (inode,fs32_to_cpu (sbi, raw_inode->i_ctime),0 ); inode->i_atime.tv_nsec =0 ; inode->i_mtime.tv_nsec =0 ; inode->i_blocks =0 ;@@ -256,7 +255,7 @@ static int __sysv_write_inode(struct inode *inode, int wait) raw_inode->i_size =cpu_to_fs32 (sbi, inode->i_size); raw_inode->i_atime =cpu_to_fs32 (sbi, inode->i_atime.tv_sec); raw_inode->i_mtime =cpu_to_fs32 (sbi, inode->i_mtime.tv_sec); - raw_inode->i_ctime =cpu_to_fs32 (sbi, inode->i_ctime.tv_sec); + raw_inode->i_ctime =cpu_to_fs32 (sbi,inode_get_ctime (inode).tv_sec); si =SYSV_I (inode);if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode))fs/sysv/itree.c +2
-2@@ -183,7 +183,7 @@ static inline int splice_branch(struct inode *inode, *where->p = where->key;write_unlock (&pointers_lock); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);/* had we spliced it onto indirect block? */ if (where->bh)@@ -423,7 +423,7 @@ void sysv_truncate (struct inode * inode) } n++; } - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);if (IS_SYNC (inode))sysv_sync_inode (inode);else fs/sysv/namei.c +3
-3@@ -103,7 +103,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir, {struct inode *inode =d_inode (old_dentry); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_link_count (inode);ihold (inode);@@ -161,7 +161,7 @@ static int sysv_unlink(struct inode * dir, struct dentry * dentry) err =sysv_delete_entry (de, page);if (!err) { - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir));inode_dec_link_count (inode); }unmap_and_put_page (page, de);@@ -230,7 +230,7 @@ static int sysv_rename(struct mnt_idmap *idmap, struct inode *old_dir,unmap_and_put_page (new_page, new_de);if (err) goto out_dir; - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);if (dir_de)drop_nlink (new_inode);inode_dec_link_count (new_inode);Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 77/92 tracefs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/tracefs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/tracefs/inode.c +1 -1
@@ -132,7 +132,7 @@ static struct inode *tracefs_get_inode(struct super_block *sb)struct inode *inode =new_inode (sb);if (inode) { inode->i_ino =get_next_ino (); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); }return inode; }
Signature · 1 line
2.41.0
Re: [PATCH v2 77/92] tracefs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- fs/tracefs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/tracefs/inode.c +1
-1@@ -132,7 +132,7 @@ static struct inode *tracefs_get_inode(struct super_block *sb)struct inode *inode =new_inode (sb);if (inode) { inode->i_ino =get_next_ino (); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); }return inode; }Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v2 77/92] tracefs: convert to ctime accessor functions
In reply to Jeff LaytonQuoted 14 lines · On Wed, 5 Jul 2023 15:01:42 -0400 Jeff Layton <[email protected]> wrote:
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.Signed-off-by Jeff Layton <[email protected]>--- fs/tracefs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/tracefs/inode.c +0
-0
fs/tracefs/inode.c static struct inode *tracefs_get_inode(struct super_block *sb) · line 138
Quoted 8 lines
fs/tracefs/inode.c +1
-1@@ -132,7 +132,7 @@ static struct inode *tracefs_get_inode(struct super_block *sb)struct inode *inode =new_inode (sb);if (inode) { inode->i_ino =get_next_ino (); - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); }return inode; }
-- Steve
Jeff Layton
maintainerPATCH v2 78/92 ubifs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/ubifs/debug.c | 4 ++-- fs/ubifs/dir.c | 24 +++++++++++------------- fs/ubifs/file.c | 16 +++++++++------- fs/ubifs/ioctl.c | 2 +- fs/ubifs/journal.c | 4 ++-- fs/ubifs/super.c | 4 ++-- fs/ubifs/xattr.c | 6 +++--- 7 files changed, 30 insertions(+), 30 deletions(-)
fs/ubifs/debug.c +2 -2
@@ -243,8 +243,8 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode) (unsigned int )inode->i_mtime.tv_sec, (unsigned int)inode->i_mtime.tv_nsec);pr_err ("\tctime %u.%u\n" , - (unsigned int )inode->i_ctime.tv_sec, - (unsigned int )inode->i_ctime.tv_nsec); + (unsigned int )inode_get_ctime (inode).tv_sec, + (unsigned int )inode_get_ctime (inode).tv_nsec);pr_err ("\tcreat_sqnum %llu\n" , ui->creat_sqnum);pr_err ("\txattr_size %u\n" , ui->xattr_size);pr_err ("\txattr_cnt %u\n" , ui->xattr_cnt);
fs/ubifs/dir.c +11 -13
@@ -96,8 +96,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir, inode->i_flags |=S_NOCMTIME ;inode_init_owner (&nop_mnt_idmap, inode, dir, mode); - inode->i_mtime = inode->i_atime = inode->i_ctime = -current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mapping->nrpages =0 ;if (!is_xattr) {
@@ -325,7 +324,7 @@ static int ubifs_create(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;
@@ -765,10 +764,10 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,inc_nlink (inode);ihold (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;
@@ -838,11 +837,11 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);drop_nlink (inode); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;
@@ -940,12 +939,12 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);clear_nlink (inode);drop_nlink (dir); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;
@@ -1019,7 +1018,7 @@ static int ubifs_mkdir(struct mnt_idmap *idmap, struct inode *dir,inc_nlink (dir); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) {ubifs_err (c,"cannot create directory, error %d" , err);
@@ -1110,7 +1109,7 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;
@@ -1210,7 +1209,7 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;
@@ -1298,7 +1297,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,struct ubifs_budget_req ino_req = { .dirtied_ino =1 , .dirtied_ino_d =ALIGN (old_inode_ui->data_len,8 ) };struct ubifs_budget_req wht_req; -struct timespec64 time;unsigned int saved_nlink;struct fscrypt_name old_nm, new_nm;
fs/ubifs/file.c +9 -7
@@ -1092,7 +1092,7 @@ static void do_attr_changes(struct inode *inode, const struct iattr *attr)if (attr->ia_valid &ATTR_MTIME ) inode->i_mtime = attr->ia_mtime;if (attr->ia_valid &ATTR_CTIME ) - inode->i_ctime = attr->ia_ctime; +inode_set_ctime_to_ts (inode, attr->ia_ctime);if (attr->ia_valid &ATTR_MODE ) {umode_t mode = attr->ia_mode;
@@ -1192,7 +1192,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex); ui->ui_size = inode->i_size;/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* Other attributes may be changed at the same time as well */ do_attr_changes (inode, attr); err =ubifs_jnl_truncate (c, inode, old_size, new_size);
@@ -1239,7 +1239,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex);if (attr->ia_valid &ATTR_SIZE ) {/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* 'truncate_setsize()' changed @i_size, update @ui_size */ ui->ui_size = inode->i_size; }
@@ -1364,8 +1364,10 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)static inline int mctime_update_needed (const struct inode *inode,const struct timespec64 *now) { +struct timespec64 ctime =inode_get_ctime (inode); +if (!timespec64_equal (&inode->i_mtime, now) || - !timespec64_equal (&inode->i_ctime, now)) + !timespec64_equal (&ctime, now))return 1 ;return 0 ; }
@@ -1396,7 +1398,7 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,if (flags &S_ATIME ) inode->i_atime = *time;if (flags &S_CTIME ) - inode->i_ctime = *time; +inode_set_ctime_to_ts (inode, *time);if (flags &S_MTIME ) inode->i_mtime = *time;
@@ -1432,7 +1434,7 @@ static int update_mctime(struct inode *inode)return err;mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);
@@ -1570,7 +1572,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)struct ubifs_inode *ui =ubifs_inode (inode);mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);
fs/ubifs/ioctl.c +1 -1
@@ -118,7 +118,7 @@ static int setflags(struct inode *inode, int flags) ui->flags &= ~ioctl2ubifs (UBIFS_SETTABLE_IOCTL_FLAGS ); ui->flags |=ioctl2ubifs (flags);ubifs_set_inode_flags (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);
fs/ubifs/journal.c +2 -2
@@ -454,8 +454,8 @@ static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, ino->creat_sqnum =cpu_to_le64 (ui->creat_sqnum); ino->atime_sec =cpu_to_le64 (inode->i_atime.tv_sec); ino->atime_nsec =cpu_to_le32 (inode->i_atime.tv_nsec); - ino->ctime_sec =cpu_to_le64 (inode->i_ctime.tv_sec); - ino->ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + ino->ctime_sec =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + ino->ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec); ino->mtime_sec =cpu_to_le64 (inode->i_mtime.tv_sec); ino->mtime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); ino->uid =cpu_to_le32 (i_uid_read (inode));
fs/ubifs/super.c +2 -2
@@ -146,8 +146,8 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) inode->i_atime.tv_nsec =le32_to_cpu (ino->atime_nsec); inode->i_mtime.tv_sec = (int64_t )le64_to_cpu (ino->mtime_sec); inode->i_mtime.tv_nsec =le32_to_cpu (ino->mtime_nsec); - inode->i_ctime.tv_sec = (int64_t )le64_to_cpu (ino->ctime_sec); - inode->i_ctime.tv_nsec =le32_to_cpu (ino->ctime_nsec); +inode_set_ctime (inode, (int64_t )le64_to_cpu (ino->ctime_sec), +le32_to_cpu (ino->ctime_nsec)); inode->i_mode =le32_to_cpu (ino->mode); inode->i_size =le64_to_cpu (ino->size);
fs/ubifs/xattr.c +3 -3
@@ -134,7 +134,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt +=1 ; host_ui->xattr_size +=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size +=CALC_XATTR_BYTES (size);
@@ -215,7 +215,7 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_size -=CALC_XATTR_BYTES (old_size); host_ui->xattr_size +=CALC_XATTR_BYTES (size);
@@ -474,7 +474,7 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,return err;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt -=1 ; host_ui->xattr_size -=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size -=CALC_XATTR_BYTES (ui->data_len);
Signature · 6 lines
2.41.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v2 78/92] ubifs: convert to ctime accessor functions
Quoted 123 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>--- fs/ubifs/debug.c | 4 ++-- fs/ubifs/dir.c | 24 +++++++++++------------- fs/ubifs/file.c | 16 +++++++++------- fs/ubifs/ioctl.c | 2 +- fs/ubifs/journal.c | 4 ++-- fs/ubifs/super.c | 4 ++-- fs/ubifs/xattr.c | 6 +++--- 7 files changed, 30 insertions(+), 30 deletions(-)fs/ubifs/debug.c +2
-2@@ -243,8 +243,8 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode) (unsigned int )inode->i_mtime.tv_sec, (unsigned int)inode->i_mtime.tv_nsec);pr_err ("\tctime %u.%u\n" , - (unsigned int )inode->i_ctime.tv_sec, - (unsigned int )inode->i_ctime.tv_nsec); + (unsigned int )inode_get_ctime (inode).tv_sec, + (unsigned int )inode_get_ctime (inode).tv_nsec);pr_err ("\tcreat_sqnum %llu\n" , ui->creat_sqnum);pr_err ("\txattr_size %u\n" , ui->xattr_size);pr_err ("\txattr_cnt %u\n" , ui->xattr_cnt);fs/ubifs/dir.c +11
-12@@ -96,8 +96,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir, inode->i_flags |=S_NOCMTIME ;inode_init_owner (&nop_mnt_idmap, inode, dir, mode); - inode->i_mtime = inode->i_atime = inode->i_ctime = -current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mapping->nrpages =0 ;if (!is_xattr) {@@ -325,7 +324,7 @@ static int ubifs_create(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -765,10 +764,10 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,inc_nlink (inode);ihold (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -838,11 +837,11 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);drop_nlink (inode); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;@@ -940,12 +939,12 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);clear_nlink (inode);drop_nlink (dir); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;@@ -1019,7 +1018,7 @@ static int ubifs_mkdir(struct mnt_idmap *idmap, struct inode *dir,inc_nlink (dir); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) {ubifs_err (c,"cannot create directory, error %d" , err);@@ -1110,7 +1109,7 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -1210,7 +1209,7 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;
fs/ubifs/dir.c static int do_rename(struct inode *old_dir, struct dentry *old_dentry, · line 1302
Quoted 7 lines
fs/ubifs/dir.c +0
-1@@ -1298,7 +1297,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,struct ubifs_budget_req ino_req = { .dirtied_ino =1 , .dirtied_ino_d =ALIGN (old_inode_ui->data_len,8 ) };struct ubifs_budget_req wht_req; -struct timespec64 time;unsigned int saved_nlink;struct fscrypt_name old_nm, new_nm;
It would be better to put the change of do_rename in '[PATCH v2 10/92] ubifs: convert to simple_rename_timestamp'.
Quoted 145 lines
fs/ubifs/file.c +9
-7@@ -1092,7 +1092,7 @@ static void do_attr_changes(struct inode *inode, const struct iattr *attr)if (attr->ia_valid &ATTR_MTIME ) inode->i_mtime = attr->ia_mtime;if (attr->ia_valid &ATTR_CTIME ) - inode->i_ctime = attr->ia_ctime; +inode_set_ctime_to_ts (inode, attr->ia_ctime);if (attr->ia_valid &ATTR_MODE ) {umode_t mode = attr->ia_mode;@@ -1192,7 +1192,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex); ui->ui_size = inode->i_size;/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* Other attributes may be changed at the same time as well */ do_attr_changes (inode, attr); err =ubifs_jnl_truncate (c, inode, old_size, new_size);@@ -1239,7 +1239,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex);if (attr->ia_valid &ATTR_SIZE ) {/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* 'truncate_setsize()' changed @i_size, update @ui_size */ ui->ui_size = inode->i_size; }@@ -1364,8 +1364,10 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)static inline int mctime_update_needed (const struct inode *inode,const struct timespec64 *now) { +struct timespec64 ctime =inode_get_ctime (inode); +if (!timespec64_equal (&inode->i_mtime, now) || - !timespec64_equal (&inode->i_ctime, now)) + !timespec64_equal (&ctime, now))return 1 ;return 0 ; }@@ -1396,7 +1398,7 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,if (flags &S_ATIME ) inode->i_atime = *time;if (flags &S_CTIME ) - inode->i_ctime = *time; +inode_set_ctime_to_ts (inode, *time);if (flags &S_MTIME ) inode->i_mtime = *time;@@ -1432,7 +1434,7 @@ static int update_mctime(struct inode *inode)return err;mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);@@ -1570,7 +1572,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)struct ubifs_inode *ui =ubifs_inode (inode);mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);fs/ubifs/ioctl.c +1
-1@@ -118,7 +118,7 @@ static int setflags(struct inode *inode, int flags) ui->flags &= ~ioctl2ubifs (UBIFS_SETTABLE_IOCTL_FLAGS ); ui->flags |=ioctl2ubifs (flags);ubifs_set_inode_flags (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);fs/ubifs/journal.c +2
-2@@ -454,8 +454,8 @@ static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, ino->creat_sqnum =cpu_to_le64 (ui->creat_sqnum); ino->atime_sec =cpu_to_le64 (inode->i_atime.tv_sec); ino->atime_nsec =cpu_to_le32 (inode->i_atime.tv_nsec); - ino->ctime_sec =cpu_to_le64 (inode->i_ctime.tv_sec); - ino->ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + ino->ctime_sec =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + ino->ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec); ino->mtime_sec =cpu_to_le64 (inode->i_mtime.tv_sec); ino->mtime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); ino->uid =cpu_to_le32 (i_uid_read (inode));fs/ubifs/super.c +2
-2@@ -146,8 +146,8 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) inode->i_atime.tv_nsec =le32_to_cpu (ino->atime_nsec); inode->i_mtime.tv_sec = (int64_t )le64_to_cpu (ino->mtime_sec); inode->i_mtime.tv_nsec =le32_to_cpu (ino->mtime_nsec); - inode->i_ctime.tv_sec = (int64_t )le64_to_cpu (ino->ctime_sec); - inode->i_ctime.tv_nsec =le32_to_cpu (ino->ctime_nsec); +inode_set_ctime (inode, (int64_t )le64_to_cpu (ino->ctime_sec), +le32_to_cpu (ino->ctime_nsec)); inode->i_mode =le32_to_cpu (ino->mode); inode->i_size =le64_to_cpu (ino->size);fs/ubifs/xattr.c +3
-3@@ -134,7 +134,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt +=1 ; host_ui->xattr_size +=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size +=CALC_XATTR_BYTES (size);@@ -215,7 +215,7 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_size -=CALC_XATTR_BYTES (old_size); host_ui->xattr_size +=CALC_XATTR_BYTES (size);@@ -474,7 +474,7 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,return err;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt -=1 ; host_ui->xattr_size -=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size -=CALC_XATTR_BYTES (ui->data_len);
Jeff Layton
maintainerRe: [PATCH v2 78/92] ubifs: convert to ctime accessor functions
Quoted 135 lines · Zhihao Cheng
Quoted 123 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>--- fs/ubifs/debug.c | 4 ++-- fs/ubifs/dir.c | 24 +++++++++++------------- fs/ubifs/file.c | 16 +++++++++------- fs/ubifs/ioctl.c | 2 +- fs/ubifs/journal.c | 4 ++-- fs/ubifs/super.c | 4 ++-- fs/ubifs/xattr.c | 6 +++--- 7 files changed, 30 insertions(+), 30 deletions(-)fs/ubifs/debug.c +2
-2@@ -243,8 +243,8 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode) (unsigned int )inode->i_mtime.tv_sec, (unsigned int)inode->i_mtime.tv_nsec);pr_err ("\tctime %u.%u\n" , - (unsigned int )inode->i_ctime.tv_sec, - (unsigned int )inode->i_ctime.tv_nsec); + (unsigned int )inode_get_ctime (inode).tv_sec, + (unsigned int )inode_get_ctime (inode).tv_nsec);pr_err ("\tcreat_sqnum %llu\n" , ui->creat_sqnum);pr_err ("\txattr_size %u\n" , ui->xattr_size);pr_err ("\txattr_cnt %u\n" , ui->xattr_cnt);fs/ubifs/dir.c +11
-12@@ -96,8 +96,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir, inode->i_flags |=S_NOCMTIME ;inode_init_owner (&nop_mnt_idmap, inode, dir, mode); - inode->i_mtime = inode->i_atime = inode->i_ctime = -current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_mapping->nrpages =0 ;if (!is_xattr) {@@ -325,7 +324,7 @@ static int ubifs_create(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -765,10 +764,10 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,inc_nlink (inode);ihold (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -838,11 +837,11 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);drop_nlink (inode); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;@@ -940,12 +939,12 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) }lock_2_inodes (dir, inode); - inode->i_ctime =current_time (dir); +inode_set_ctime_current (inode);clear_nlink (inode);drop_nlink (dir); dir->i_size -= sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,1 ,0 );if (err) goto out_cancel;@@ -1019,7 +1018,7 @@ static int ubifs_mkdir(struct mnt_idmap *idmap, struct inode *dir,inc_nlink (dir); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) {ubifs_err (c,"cannot create directory, error %d" , err);@@ -1110,7 +1109,7 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;@@ -1210,7 +1209,7 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,mutex_lock (&dir_ui->ui_mutex); dir->i_size += sz_change; dir_ui->ui_size = dir->i_size; - dir->i_mtime = dir->i_ctime = inode->i_ctime; + dir->i_mtime =inode_set_ctime_to_ts (dir,inode_get_ctime (inode)); err =ubifs_jnl_update (c, dir, &nm, inode,0 ,0 );if (err) goto out_cancel;fs/ubifs/dir.c static int do_rename(struct inode *old_dir, struct dentry *old_dentry, · line 1302
Quoted 7 lines
fs/ubifs/dir.c +0
-1@@ -1298,7 +1297,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,struct ubifs_budget_req ino_req = { .dirtied_ino =1 , .dirtied_ino_d =ALIGN (old_inode_ui->data_len,8 ) };struct ubifs_budget_req wht_req; -struct timespec64 time;unsigned int saved_nlink;struct fscrypt_name old_nm, new_nm;It would be better to put the change of
do_renamein '[PATCH v2 10/92]
ubifs: convert tosimple_rename_timestamp'.
Quoted 2 lines
Reviewed-by Zhihao Cheng <[email protected]>
Good catch. I'll fix that up in my tree.
Thanks!
Quoted 146 lines
Quoted 145 lines
fs/ubifs/file.c +9
-7@@ -1092,7 +1092,7 @@ static void do_attr_changes(struct inode *inode, const struct iattr *attr)if (attr->ia_valid &ATTR_MTIME ) inode->i_mtime = attr->ia_mtime;if (attr->ia_valid &ATTR_CTIME ) - inode->i_ctime = attr->ia_ctime; +inode_set_ctime_to_ts (inode, attr->ia_ctime);if (attr->ia_valid &ATTR_MODE ) {umode_t mode = attr->ia_mode;@@ -1192,7 +1192,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex); ui->ui_size = inode->i_size;/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* Other attributes may be changed at the same time as well */ do_attr_changes (inode, attr); err =ubifs_jnl_truncate (c, inode, old_size, new_size);@@ -1239,7 +1239,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,mutex_lock (&ui->ui_mutex);if (attr->ia_valid &ATTR_SIZE ) {/* Truncation changes inode [mc]time */ - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);/* 'truncate_setsize()' changed @i_size, update @ui_size */ ui->ui_size = inode->i_size; }@@ -1364,8 +1364,10 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)static inline int mctime_update_needed (const struct inode *inode,const struct timespec64 *now) { +struct timespec64 ctime =inode_get_ctime (inode); +if (!timespec64_equal (&inode->i_mtime, now) || - !timespec64_equal (&inode->i_ctime, now)) + !timespec64_equal (&ctime, now))return 1 ;return 0 ; }@@ -1396,7 +1398,7 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,if (flags &S_ATIME ) inode->i_atime = *time;if (flags &S_CTIME ) - inode->i_ctime = *time; +inode_set_ctime_to_ts (inode, *time);if (flags &S_MTIME ) inode->i_mtime = *time;@@ -1432,7 +1434,7 @@ static int update_mctime(struct inode *inode)return err;mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);@@ -1570,7 +1572,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)struct ubifs_inode *ui =ubifs_inode (inode);mutex_lock (&ui->ui_mutex); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);fs/ubifs/ioctl.c +1
-1@@ -118,7 +118,7 @@ static int setflags(struct inode *inode, int flags) ui->flags &= ~ioctl2ubifs (UBIFS_SETTABLE_IOCTL_FLAGS ); ui->flags |=ioctl2ubifs (flags);ubifs_set_inode_flags (inode); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode); release = ui->dirty;mark_inode_dirty_sync (inode);mutex_unlock (&ui->ui_mutex);fs/ubifs/journal.c +2
-2@@ -454,8 +454,8 @@ static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, ino->creat_sqnum =cpu_to_le64 (ui->creat_sqnum); ino->atime_sec =cpu_to_le64 (inode->i_atime.tv_sec); ino->atime_nsec =cpu_to_le32 (inode->i_atime.tv_nsec); - ino->ctime_sec =cpu_to_le64 (inode->i_ctime.tv_sec); - ino->ctime_nsec =cpu_to_le32 (inode->i_ctime.tv_nsec); + ino->ctime_sec =cpu_to_le64 (inode_get_ctime (inode).tv_sec); + ino->ctime_nsec =cpu_to_le32 (inode_get_ctime (inode).tv_nsec); ino->mtime_sec =cpu_to_le64 (inode->i_mtime.tv_sec); ino->mtime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); ino->uid =cpu_to_le32 (i_uid_read (inode));fs/ubifs/super.c +2
-2@@ -146,8 +146,8 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) inode->i_atime.tv_nsec =le32_to_cpu (ino->atime_nsec); inode->i_mtime.tv_sec = (int64_t )le64_to_cpu (ino->mtime_sec); inode->i_mtime.tv_nsec =le32_to_cpu (ino->mtime_nsec); - inode->i_ctime.tv_sec = (int64_t )le64_to_cpu (ino->ctime_sec); - inode->i_ctime.tv_nsec =le32_to_cpu (ino->ctime_nsec); +inode_set_ctime (inode, (int64_t )le64_to_cpu (ino->ctime_sec), +le32_to_cpu (ino->ctime_nsec)); inode->i_mode =le32_to_cpu (ino->mode); inode->i_size =le64_to_cpu (ino->size);fs/ubifs/xattr.c +3
-3@@ -134,7 +134,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt +=1 ; host_ui->xattr_size +=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size +=CALC_XATTR_BYTES (size);@@ -215,7 +215,7 @@ static int change_xattr(struct ubifs_info *c, struct inode *host, ui->data_len = size;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_size -=CALC_XATTR_BYTES (old_size); host_ui->xattr_size +=CALC_XATTR_BYTES (size);@@ -474,7 +474,7 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,return err;mutex_lock (&host_ui->ui_mutex); - host->i_ctime =current_time (host); +inode_set_ctime_current (host); host_ui->xattr_cnt -=1 ; host_ui->xattr_size -=CALC_DENT_SIZE (fname_len (nm)); host_ui->xattr_size -=CALC_XATTR_BYTES (ui->data_len);
Signature · 5 lines
Jeff Layton <[email protected]> ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Jeff Layton
maintainerPATCH v2 79/92 udf: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/udf/ialloc.c | 2 +- fs/udf/inode.c | 17 ++++++++++------- fs/udf/namei.c | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 20 deletions(-)
fs/udf/ialloc.c +1 -1
@@ -100,7 +100,7 @@ struct inode *udf_new_inode(struct inode *dir, umode_t mode) iinfo->i_alloc_type =ICBTAG_FLAG_AD_SHORT ; else iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); iinfo->i_crtime = inode->i_mtime;if (unlikely (insert_inode_locked (inode) <0 )) {make_bad_inode (inode);
fs/udf/inode.c +10 -7
@@ -910,7 +910,7 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map) map->oflags =UDF_BLK_NEW |UDF_BLK_MAPPED ; iinfo->i_next_alloc_block = map->lblk +1 ; iinfo->i_next_alloc_goal = newblocknum +1 ; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (IS_SYNC (inode))udf_sync_inode (inode);
@@ -1298,7 +1298,7 @@ int udf_setsize(struct inode *inode, loff_t newsize) goto out_unlock; } update_time: - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);if (IS_SYNC (inode))udf_sync_inode (inode);else
@@ -1329,6 +1329,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)int bs = inode->i_sb->s_blocksize;int ret = -EIO ;uint32_t uid, gid; +struct timespec64 ctime; reread:if (iloc->partitionReferenceNum >= sbi->s_partitions) {
@@ -1507,7 +1508,8 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)udf_disk_stamp_to_time (&inode->i_atime, fe->accessTime);udf_disk_stamp_to_time (&inode->i_mtime, fe->modificationTime); -udf_disk_stamp_to_time (&inode->i_ctime, fe->attrTime); +udf_disk_stamp_to_time (&ctime, fe->attrTime); +inode_set_ctime_to_ts (inode, ctime); iinfo->i_unique =le64_to_cpu (fe->uniqueID); iinfo->i_lenEAttr =le32_to_cpu (fe->lengthExtendedAttr);
@@ -1522,7 +1524,8 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)udf_disk_stamp_to_time (&inode->i_atime, efe->accessTime);udf_disk_stamp_to_time (&inode->i_mtime, efe->modificationTime);udf_disk_stamp_to_time (&iinfo->i_crtime, efe->createTime); -udf_disk_stamp_to_time (&inode->i_ctime, efe->attrTime); +udf_disk_stamp_to_time (&ctime, efe->attrTime); +inode_set_ctime_to_ts (inode, ctime); iinfo->i_unique =le64_to_cpu (efe->uniqueID); iinfo->i_lenEAttr =le32_to_cpu (efe->lengthExtendedAttr);
@@ -1799,7 +1802,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)udf_time_to_disk_stamp (&fe->accessTime, inode->i_atime);udf_time_to_disk_stamp (&fe->modificationTime, inode->i_mtime); -udf_time_to_disk_stamp (&fe->attrTime, inode->i_ctime); +udf_time_to_disk_stamp (&fe->attrTime,inode_get_ctime (inode));memset (&(fe->impIdent),0 ,sizeof (struct regid ));strcpy (fe->impIdent.ident,UDF_ID_DEVELOPER ); fe->impIdent.identSuffix[0 ] =UDF_OS_CLASS_UNIX ;
@@ -1830,12 +1833,12 @@ static int udf_update_inode(struct inode *inode, int do_sync)udf_adjust_time (iinfo, inode->i_atime);udf_adjust_time (iinfo, inode->i_mtime); -udf_adjust_time (iinfo, inode->i_ctime); +udf_adjust_time (iinfo,inode_get_ctime (inode));udf_time_to_disk_stamp (&efe->accessTime, inode->i_atime);udf_time_to_disk_stamp (&efe->modificationTime, inode->i_mtime);udf_time_to_disk_stamp (&efe->createTime, iinfo->i_crtime); -udf_time_to_disk_stamp (&efe->attrTime, inode->i_ctime); +udf_time_to_disk_stamp (&efe->attrTime,inode_get_ctime (inode));memset (&(efe->impIdent),0 ,sizeof (efe->impIdent));strcpy (efe->impIdent.ident,UDF_ID_DEVELOPER );
fs/udf/namei.c +12 -12
@@ -365,7 +365,7 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode) *(__le32 *)((struct allocDescImpUse *)iter.fi.icb.impUse)->impUse =cpu_to_le32 (iinfo->i_unique &0x00000000FFFFFFFFUL );udf_fiiter_write_fi (&iter,NULL ); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);udf_fiiter_release (&iter);udf_add_fid_counter (dir->i_sb, false,1 );
@@ -471,7 +471,7 @@ static int udf_mkdir(struct mnt_idmap *idmap, struct inode *dir,udf_fiiter_release (&iter);udf_add_fid_counter (dir->i_sb, true,1 );inc_nlink (dir); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);d_instantiate_new (dentry, inode);
@@ -523,8 +523,8 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) inode->i_size =0 ;inode_dec_link_count (dir);udf_add_fid_counter (dir->i_sb, true,-1 ); - inode->i_ctime = dir->i_ctime = dir->i_mtime = -current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));mark_inode_dirty (dir); ret =0 ; end_rmdir:
@@ -555,11 +555,11 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry)set_nlink (inode,1 ); }udf_fiiter_delete_entry (&iter); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);inode_dec_link_count (inode);udf_add_fid_counter (dir->i_sb, false,-1 ); - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir)); ret =0 ; end_unlink:udf_fiiter_release (&iter);
@@ -746,9 +746,9 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir,inc_nlink (inode);udf_add_fid_counter (dir->i_sb, false,1 ); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);ihold (inode);d_instantiate (dentry, inode);
@@ -833,7 +833,7 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir,* Like most other Unix systems, set the ctime for inodes on a * rename. */ - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);mark_inode_dirty (old_inode);/*
@@ -861,13 +861,13 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, }if (new_inode) { - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);inode_dec_link_count (new_inode);udf_add_fid_counter (old_dir->i_sb,S_ISDIR (new_inode->i_mode),-1 ); } - old_dir->i_ctime = old_dir->i_mtime =current_time (old_dir); - new_dir->i_ctime = new_dir->i_mtime =current_time (new_dir); + old_dir->i_mtime =inode_set_ctime_current (old_dir); + new_dir->i_mtime =inode_set_ctime_current (new_dir);mark_inode_dirty (old_dir);mark_inode_dirty (new_dir);
Signature · 1 line
2.41.0
Re: [PATCH v2 79/92] udf: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good to me. Feel free to add:
Honza
Quoted 181 lines
--- fs/udf/ialloc.c | 2 +- fs/udf/inode.c | 17 ++++++++++------- fs/udf/namei.c | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 20 deletions(-)fs/udf/ialloc.c +1
-1@@ -100,7 +100,7 @@ struct inode *udf_new_inode(struct inode *dir, umode_t mode) iinfo->i_alloc_type =ICBTAG_FLAG_AD_SHORT ; else iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); iinfo->i_crtime = inode->i_mtime;if (unlikely (insert_inode_locked (inode) <0 )) {make_bad_inode (inode);fs/udf/inode.c +10
-7@@ -910,7 +910,7 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map) map->oflags =UDF_BLK_NEW |UDF_BLK_MAPPED ; iinfo->i_next_alloc_block = map->lblk +1 ; iinfo->i_next_alloc_goal = newblocknum +1 ; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (IS_SYNC (inode))udf_sync_inode (inode);@@ -1298,7 +1298,7 @@ int udf_setsize(struct inode *inode, loff_t newsize) goto out_unlock; } update_time: - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);if (IS_SYNC (inode))udf_sync_inode (inode);else @@ -1329,6 +1329,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)int bs = inode->i_sb->s_blocksize;int ret = -EIO ;uint32_t uid, gid; +struct timespec64 ctime; reread:if (iloc->partitionReferenceNum >= sbi->s_partitions) {@@ -1507,7 +1508,8 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)udf_disk_stamp_to_time (&inode->i_atime, fe->accessTime);udf_disk_stamp_to_time (&inode->i_mtime, fe->modificationTime); -udf_disk_stamp_to_time (&inode->i_ctime, fe->attrTime); +udf_disk_stamp_to_time (&ctime, fe->attrTime); +inode_set_ctime_to_ts (inode, ctime); iinfo->i_unique =le64_to_cpu (fe->uniqueID); iinfo->i_lenEAttr =le32_to_cpu (fe->lengthExtendedAttr);@@ -1522,7 +1524,8 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode)udf_disk_stamp_to_time (&inode->i_atime, efe->accessTime);udf_disk_stamp_to_time (&inode->i_mtime, efe->modificationTime);udf_disk_stamp_to_time (&iinfo->i_crtime, efe->createTime); -udf_disk_stamp_to_time (&inode->i_ctime, efe->attrTime); +udf_disk_stamp_to_time (&ctime, efe->attrTime); +inode_set_ctime_to_ts (inode, ctime); iinfo->i_unique =le64_to_cpu (efe->uniqueID); iinfo->i_lenEAttr =le32_to_cpu (efe->lengthExtendedAttr);@@ -1799,7 +1802,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)udf_time_to_disk_stamp (&fe->accessTime, inode->i_atime);udf_time_to_disk_stamp (&fe->modificationTime, inode->i_mtime); -udf_time_to_disk_stamp (&fe->attrTime, inode->i_ctime); +udf_time_to_disk_stamp (&fe->attrTime,inode_get_ctime (inode));memset (&(fe->impIdent),0 ,sizeof (struct regid ));strcpy (fe->impIdent.ident,UDF_ID_DEVELOPER ); fe->impIdent.identSuffix[0 ] =UDF_OS_CLASS_UNIX ;@@ -1830,12 +1833,12 @@ static int udf_update_inode(struct inode *inode, int do_sync)udf_adjust_time (iinfo, inode->i_atime);udf_adjust_time (iinfo, inode->i_mtime); -udf_adjust_time (iinfo, inode->i_ctime); +udf_adjust_time (iinfo,inode_get_ctime (inode));udf_time_to_disk_stamp (&efe->accessTime, inode->i_atime);udf_time_to_disk_stamp (&efe->modificationTime, inode->i_mtime);udf_time_to_disk_stamp (&efe->createTime, iinfo->i_crtime); -udf_time_to_disk_stamp (&efe->attrTime, inode->i_ctime); +udf_time_to_disk_stamp (&efe->attrTime,inode_get_ctime (inode));memset (&(efe->impIdent),0 ,sizeof (efe->impIdent));strcpy (efe->impIdent.ident,UDF_ID_DEVELOPER );fs/udf/namei.c +12
-12@@ -365,7 +365,7 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode) *(__le32 *)((struct allocDescImpUse *)iter.fi.icb.impUse)->impUse =cpu_to_le32 (iinfo->i_unique &0x00000000FFFFFFFFUL );udf_fiiter_write_fi (&iter,NULL ); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);udf_fiiter_release (&iter);udf_add_fid_counter (dir->i_sb, false,1 );@@ -471,7 +471,7 @@ static int udf_mkdir(struct mnt_idmap *idmap, struct inode *dir,udf_fiiter_release (&iter);udf_add_fid_counter (dir->i_sb, true,1 );inc_nlink (dir); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);d_instantiate_new (dentry, inode);@@ -523,8 +523,8 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) inode->i_size =0 ;inode_dec_link_count (dir);udf_add_fid_counter (dir->i_sb, true,-1 ); - inode->i_ctime = dir->i_ctime = dir->i_mtime = -current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));mark_inode_dirty (dir); ret =0 ; end_rmdir:@@ -555,11 +555,11 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry)set_nlink (inode,1 ); }udf_fiiter_delete_entry (&iter); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);inode_dec_link_count (inode);udf_add_fid_counter (dir->i_sb, false,-1 ); - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir)); ret =0 ; end_unlink:udf_fiiter_release (&iter);@@ -746,9 +746,9 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir,inc_nlink (inode);udf_add_fid_counter (dir->i_sb, false,1 ); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);ihold (inode);d_instantiate (dentry, inode);@@ -833,7 +833,7 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir,* Like most other Unix systems, set the ctime for inodes on a * rename. */ - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);mark_inode_dirty (old_inode);/* @@ -861,13 +861,13 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, }if (new_inode) { - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);inode_dec_link_count (new_inode);udf_add_fid_counter (old_dir->i_sb,S_ISDIR (new_inode->i_mode),-1 ); } - old_dir->i_ctime = old_dir->i_mtime =current_time (old_dir); - new_dir->i_ctime = new_dir->i_mtime =current_time (new_dir); + old_dir->i_mtime =inode_set_ctime_current (old_dir); + new_dir->i_mtime =inode_set_ctime_current (new_dir);mark_inode_dirty (old_dir);mark_inode_dirty (new_dir);Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 80/92 ufs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/ufs/dir.c | 6 +++--- fs/ufs/ialloc.c | 2 +- fs/ufs/inode.c | 23 +++++++++++++---------- fs/ufs/namei.c | 8 ++++---- 4 files changed, 21 insertions(+), 18 deletions(-)
fs/ufs/dir.c +3 -3
@@ -107,7 +107,7 @@ void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,ufs_commit_chunk (page, pos, len);ufs_put_page (page);if (update_times) - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);ufs_handle_dirsync (dir); }
@@ -397,7 +397,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)ufs_set_de_type (sb, de, inode->i_mode);ufs_commit_chunk (page, pos, rec_len); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir); err =ufs_handle_dirsync (dir);
@@ -539,7 +539,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir, pde->d_reclen =cpu_to_fs16 (sb, to - from); dir->d_ino =0 ;ufs_commit_chunk (page, pos, to - from); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode); err =ufs_handle_dirsync (inode); out:
fs/ufs/ialloc.c +1 -1
@@ -292,7 +292,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode)inode_init_owner (&nop_mnt_idmap, inode, dir, mode); inode->i_blocks =0 ; inode->i_generation =0 ; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); ufsi->i_flags =UFS_I (dir)->i_flags; ufsi->i_lastfrag =0 ; ufsi->i_shadow =0 ;
fs/ufs/inode.c +13 -10
@@ -296,7 +296,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index,if (new) *new =1 ; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (IS_SYNC (inode))ufs_sync_inode (inode);mark_inode_dirty (inode);
@@ -378,7 +378,7 @@ ufs_inode_getblock(struct inode *inode, u64 ind_block,mark_buffer_dirty (bh);if (IS_SYNC (inode))sync_dirty_buffer (bh); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); out:brelse (bh);
@@ -580,11 +580,12 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode) inode->i_size =fs64_to_cpu (sb, ufs_inode->ui_size); inode->i_atime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_atime.tv_sec); - inode->i_ctime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_ctime.tv_sec); +inode_set_ctime (inode, + (signed )fs32_to_cpu (sb, ufs_inode->ui_ctime.tv_sec), +0 ); inode->i_mtime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_mtime.tv_sec); inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ; inode->i_blocks =fs32_to_cpu (sb, ufs_inode->ui_blocks); inode->i_generation =fs32_to_cpu (sb, ufs_inode->ui_gen); ufsi->i_flags =fs32_to_cpu (sb, ufs_inode->ui_flags);
@@ -626,10 +627,10 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode) inode->i_size =fs64_to_cpu (sb, ufs2_inode->ui_size); inode->i_atime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_atime); - inode->i_ctime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_ctime); +inode_set_ctime (inode,fs64_to_cpu (sb, ufs2_inode->ui_ctime), +fs32_to_cpu (sb, ufs2_inode->ui_ctimensec)); inode->i_mtime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_mtime); inode->i_atime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_atimensec); - inode->i_ctime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_ctimensec); inode->i_mtime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_mtimensec); inode->i_blocks =fs64_to_cpu (sb, ufs2_inode->ui_blocks); inode->i_generation =fs32_to_cpu (sb, ufs2_inode->ui_gen);
@@ -726,7 +727,8 @@ static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode) ufs_inode->ui_size =cpu_to_fs64 (sb, inode->i_size); ufs_inode->ui_atime.tv_sec =cpu_to_fs32 (sb, inode->i_atime.tv_sec); ufs_inode->ui_atime.tv_usec =0 ; - ufs_inode->ui_ctime.tv_sec =cpu_to_fs32 (sb, inode->i_ctime.tv_sec); + ufs_inode->ui_ctime.tv_sec =cpu_to_fs32 (sb, +inode_get_ctime (inode).tv_sec); ufs_inode->ui_ctime.tv_usec =0 ; ufs_inode->ui_mtime.tv_sec =cpu_to_fs32 (sb, inode->i_mtime.tv_sec); ufs_inode->ui_mtime.tv_usec =0 ;
@@ -770,8 +772,9 @@ static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode) ufs_inode->ui_size =cpu_to_fs64 (sb, inode->i_size); ufs_inode->ui_atime =cpu_to_fs64 (sb, inode->i_atime.tv_sec); ufs_inode->ui_atimensec =cpu_to_fs32 (sb, inode->i_atime.tv_nsec); - ufs_inode->ui_ctime =cpu_to_fs64 (sb, inode->i_ctime.tv_sec); - ufs_inode->ui_ctimensec =cpu_to_fs32 (sb, inode->i_ctime.tv_nsec); + ufs_inode->ui_ctime =cpu_to_fs64 (sb,inode_get_ctime (inode).tv_sec); + ufs_inode->ui_ctimensec =cpu_to_fs32 (sb, +inode_get_ctime (inode).tv_nsec); ufs_inode->ui_mtime =cpu_to_fs64 (sb, inode->i_mtime.tv_sec); ufs_inode->ui_mtimensec =cpu_to_fs32 (sb, inode->i_mtime.tv_nsec);
@@ -1205,7 +1208,7 @@ static int ufs_truncate(struct inode *inode, loff_t size)truncate_setsize (inode, size);ufs_truncate_blocks (inode); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode); out:UFSD ("EXIT: err %d\n" , err);
fs/ufs/namei.c +4 -4
@@ -153,7 +153,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,struct inode *inode =d_inode (old_dentry);int error; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_link_count (inode);ihold (inode);
@@ -220,7 +220,7 @@ static int ufs_unlink(struct inode *dir, struct dentry *dentry)if (err) goto out; - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir));inode_dec_link_count (inode); err =0 ; out:
@@ -282,7 +282,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (!new_de) goto out_dir;ufs_set_link (new_dir, new_de, new_page, old_inode,1 ); - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);if (dir_de)drop_nlink (new_inode);inode_dec_link_count (new_inode);
@@ -298,7 +298,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,* Like most other Unix systems, set the ctime for inodes on a * rename. */ - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);ufs_delete_entry (old_dir, old_de, old_page);mark_inode_dirty (old_inode);
Signature · 1 line
2.41.0
Re: [PATCH v2 80/92] ufs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 175 lines
--- fs/ufs/dir.c | 6 +++--- fs/ufs/ialloc.c | 2 +- fs/ufs/inode.c | 23 +++++++++++++---------- fs/ufs/namei.c | 8 ++++---- 4 files changed, 21 insertions(+), 18 deletions(-)fs/ufs/dir.c +3
-3@@ -107,7 +107,7 @@ void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,ufs_commit_chunk (page, pos, len);ufs_put_page (page);if (update_times) - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir);ufs_handle_dirsync (dir); }@@ -397,7 +397,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)ufs_set_de_type (sb, de, inode->i_mode);ufs_commit_chunk (page, pos, rec_len); - dir->i_mtime = dir->i_ctime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);mark_inode_dirty (dir); err =ufs_handle_dirsync (dir);@@ -539,7 +539,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir, pde->d_reclen =cpu_to_fs16 (sb, to - from); dir->d_ino =0 ;ufs_commit_chunk (page, pos, to - from); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode); err =ufs_handle_dirsync (inode); out:fs/ufs/ialloc.c +1
-1@@ -292,7 +292,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode)inode_init_owner (&nop_mnt_idmap, inode, dir, mode); inode->i_blocks =0 ; inode->i_generation =0 ; - inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); ufsi->i_flags =UFS_I (dir)->i_flags; ufsi->i_lastfrag =0 ; ufsi->i_shadow =0 ;fs/ufs/inode.c +13
-10@@ -296,7 +296,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index,if (new) *new =1 ; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (IS_SYNC (inode))ufs_sync_inode (inode);mark_inode_dirty (inode);@@ -378,7 +378,7 @@ ufs_inode_getblock(struct inode *inode, u64 ind_block,mark_buffer_dirty (bh);if (IS_SYNC (inode))sync_dirty_buffer (bh); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);mark_inode_dirty (inode); out:brelse (bh);@@ -580,11 +580,12 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode) inode->i_size =fs64_to_cpu (sb, ufs_inode->ui_size); inode->i_atime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_atime.tv_sec); - inode->i_ctime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_ctime.tv_sec); +inode_set_ctime (inode, + (signed )fs32_to_cpu (sb, ufs_inode->ui_ctime.tv_sec), +0 ); inode->i_mtime.tv_sec = (signed )fs32_to_cpu (sb, ufs_inode->ui_mtime.tv_sec); inode->i_mtime.tv_nsec =0 ; inode->i_atime.tv_nsec =0 ; - inode->i_ctime.tv_nsec =0 ; inode->i_blocks =fs32_to_cpu (sb, ufs_inode->ui_blocks); inode->i_generation =fs32_to_cpu (sb, ufs_inode->ui_gen); ufsi->i_flags =fs32_to_cpu (sb, ufs_inode->ui_flags);@@ -626,10 +627,10 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode) inode->i_size =fs64_to_cpu (sb, ufs2_inode->ui_size); inode->i_atime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_atime); - inode->i_ctime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_ctime); +inode_set_ctime (inode,fs64_to_cpu (sb, ufs2_inode->ui_ctime), +fs32_to_cpu (sb, ufs2_inode->ui_ctimensec)); inode->i_mtime.tv_sec =fs64_to_cpu (sb, ufs2_inode->ui_mtime); inode->i_atime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_atimensec); - inode->i_ctime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_ctimensec); inode->i_mtime.tv_nsec =fs32_to_cpu (sb, ufs2_inode->ui_mtimensec); inode->i_blocks =fs64_to_cpu (sb, ufs2_inode->ui_blocks); inode->i_generation =fs32_to_cpu (sb, ufs2_inode->ui_gen);@@ -726,7 +727,8 @@ static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode) ufs_inode->ui_size =cpu_to_fs64 (sb, inode->i_size); ufs_inode->ui_atime.tv_sec =cpu_to_fs32 (sb, inode->i_atime.tv_sec); ufs_inode->ui_atime.tv_usec =0 ; - ufs_inode->ui_ctime.tv_sec =cpu_to_fs32 (sb, inode->i_ctime.tv_sec); + ufs_inode->ui_ctime.tv_sec =cpu_to_fs32 (sb, +inode_get_ctime (inode).tv_sec); ufs_inode->ui_ctime.tv_usec =0 ; ufs_inode->ui_mtime.tv_sec =cpu_to_fs32 (sb, inode->i_mtime.tv_sec); ufs_inode->ui_mtime.tv_usec =0 ;@@ -770,8 +772,9 @@ static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode) ufs_inode->ui_size =cpu_to_fs64 (sb, inode->i_size); ufs_inode->ui_atime =cpu_to_fs64 (sb, inode->i_atime.tv_sec); ufs_inode->ui_atimensec =cpu_to_fs32 (sb, inode->i_atime.tv_nsec); - ufs_inode->ui_ctime =cpu_to_fs64 (sb, inode->i_ctime.tv_sec); - ufs_inode->ui_ctimensec =cpu_to_fs32 (sb, inode->i_ctime.tv_nsec); + ufs_inode->ui_ctime =cpu_to_fs64 (sb,inode_get_ctime (inode).tv_sec); + ufs_inode->ui_ctimensec =cpu_to_fs32 (sb, +inode_get_ctime (inode).tv_nsec); ufs_inode->ui_mtime =cpu_to_fs64 (sb, inode->i_mtime.tv_sec); ufs_inode->ui_mtimensec =cpu_to_fs32 (sb, inode->i_mtime.tv_nsec);@@ -1205,7 +1208,7 @@ static int ufs_truncate(struct inode *inode, loff_t size)truncate_setsize (inode, size);ufs_truncate_blocks (inode); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);mark_inode_dirty (inode); out:UFSD ("EXIT: err %d\n" , err);fs/ufs/namei.c +4
-4@@ -153,7 +153,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,struct inode *inode =d_inode (old_dentry);int error; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_link_count (inode);ihold (inode);@@ -220,7 +220,7 @@ static int ufs_unlink(struct inode *dir, struct dentry *dentry)if (err) goto out; - inode->i_ctime = dir->i_ctime; +inode_set_ctime_to_ts (inode,inode_get_ctime (dir));inode_dec_link_count (inode); err =0 ; out:@@ -282,7 +282,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (!new_de) goto out_dir;ufs_set_link (new_dir, new_de, new_page, old_inode,1 ); - new_inode->i_ctime =current_time (new_inode); +inode_set_ctime_current (new_inode);if (dir_de)drop_nlink (new_inode);inode_dec_link_count (new_inode);@@ -298,7 +298,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,* Like most other Unix systems, set the ctime for inodes on a * rename. */ - old_inode->i_ctime =current_time (old_inode); +inode_set_ctime_current (old_inode);ufs_delete_entry (old_dir, old_de, old_page);mark_inode_dirty (old_inode);Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 81/92 vboxsf: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/vboxsf/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/vboxsf/utils.c +2 -2
@@ -128,8 +128,8 @@ int vboxsf_init_inode(struct vboxsf_sbi *sbi, struct inode *inode, inode->i_atime =ns_to_timespec64 ( info->access_time.ns_relative_to_unix_epoch); - inode->i_ctime =ns_to_timespec64 ( - info->change_time.ns_relative_to_unix_epoch); +inode_set_ctime_to_ts (inode, +ns_to_timespec64 (info->change_time.ns_relative_to_unix_epoch)); inode->i_mtime =ns_to_timespec64 ( info->modification_time.ns_relative_to_unix_epoch);return 0 ;
Signature · 1 line
2.41.0
Re: [PATCH v2 81/92] vboxsf: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 22 lines
--- fs/vboxsf/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/vboxsf/utils.c +2
-2@@ -128,8 +128,8 @@ int vboxsf_init_inode(struct vboxsf_sbi *sbi, struct inode *inode, inode->i_atime =ns_to_timespec64 ( info->access_time.ns_relative_to_unix_epoch); - inode->i_ctime =ns_to_timespec64 ( - info->change_time.ns_relative_to_unix_epoch); +inode_set_ctime_to_ts (inode, +ns_to_timespec64 (info->change_time.ns_relative_to_unix_epoch)); inode->i_mtime =ns_to_timespec64 ( info->modification_time.ns_relative_to_unix_epoch);return 0 ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 82/92 xfs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/xfs/libxfs/xfs_inode_buf.c | 5 +++-- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_bmap_util.c | 6 ++++-- fs/xfs/xfs_inode.c | 3 +-- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_iops.c | 4 ++-- fs/xfs/xfs_itable.c | 4 ++-- 8 files changed, 15 insertions(+), 13 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +3 -2
@@ -222,7 +222,8 @@ xfs_inode_from_disk(*/ inode->i_atime =xfs_inode_from_disk_ts (from, from->di_atime); inode->i_mtime =xfs_inode_from_disk_ts (from, from->di_mtime); - inode->i_ctime =xfs_inode_from_disk_ts (from, from->di_ctime); +inode_set_ctime_to_ts (inode, +xfs_inode_from_disk_ts (from, from->di_ctime)); ip->i_disk_size =be64_to_cpu (from->di_size); ip->i_nblocks =be64_to_cpu (from->di_nblocks);
@@ -316,7 +317,7 @@ xfs_inode_to_disk( to->di_atime =xfs_inode_to_disk_ts (ip, inode->i_atime); to->di_mtime =xfs_inode_to_disk_ts (ip, inode->i_mtime); - to->di_ctime =xfs_inode_to_disk_ts (ip, inode->i_ctime); + to->di_ctime =xfs_inode_to_disk_ts (ip,inode_get_ctime (inode)); to->di_nlink =cpu_to_be32 (inode->i_nlink); to->di_gen =cpu_to_be32 (inode->i_generation); to->di_mode =cpu_to_be16 (inode->i_mode);
fs/xfs/libxfs/xfs_trans_inode.c +1 -1
@@ -67,7 +67,7 @@ xfs_trans_ichgtime(if (flags &XFS_ICHGTIME_MOD ) inode->i_mtime = tv;if (flags &XFS_ICHGTIME_CHG ) - inode->i_ctime = tv; +inode_set_ctime_to_ts (inode, tv);if (flags &XFS_ICHGTIME_CREATE ) ip->i_crtime = tv; }
fs/xfs/xfs_acl.c +1 -1
@@ -233,7 +233,7 @@ xfs_acl_set_mode(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); inode->i_mode = mode; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );if (xfs_has_wsync (mp))
fs/xfs/xfs_bmap_util.c +4 -2
@@ -1644,6 +1644,7 @@ xfs_swap_extents(uint64_t f;int resblks =0 ;unsigned int flags =0 ; +struct timespec64 ctime;/* * Lock the inodes against other IO, page faults and truncate to
@@ -1756,8 +1757,9 @@ xfs_swap_extents(* process that the file was not changed out from * under it. */ -if ((sbp->bs_ctime.tv_sec !=VFS_I (ip)->i_ctime.tv_sec) || - (sbp->bs_ctime.tv_nsec !=VFS_I (ip)->i_ctime.tv_nsec) || + ctime =inode_get_ctime (VFS_I (ip)); +if ((sbp->bs_ctime.tv_sec != ctime.tv_sec) || + (sbp->bs_ctime.tv_nsec != ctime.tv_nsec) || (sbp->bs_mtime.tv_sec !=VFS_I (ip)->i_mtime.tv_sec) || (sbp->bs_mtime.tv_nsec !=VFS_I (ip)->i_mtime.tv_nsec)) { error = -EBUSY ;
fs/xfs/xfs_inode.c +1 -2
@@ -843,10 +843,9 @@ xfs_init_new_inode( ip->i_df.if_nextents =0 ;ASSERT (ip->i_nblocks ==0 ); - tv =current_time (inode); + tv =inode_set_ctime_current (inode); inode->i_mtime = tv; inode->i_atime = tv; - inode->i_ctime = tv; ip->i_extsize =0 ; ip->i_diflags =0 ;
fs/xfs/xfs_inode_item.c +1 -1
@@ -528,7 +528,7 @@ xfs_inode_to_log_dinode(memset (to->di_pad3,0 ,sizeof (to->di_pad3)); to->di_atime =xfs_inode_to_log_dinode_ts (ip, inode->i_atime); to->di_mtime =xfs_inode_to_log_dinode_ts (ip, inode->i_mtime); - to->di_ctime =xfs_inode_to_log_dinode_ts (ip, inode->i_ctime); + to->di_ctime =xfs_inode_to_log_dinode_ts (ip,inode_get_ctime (inode)); to->di_nlink = inode->i_nlink; to->di_gen = inode->i_generation; to->di_mode = inode->i_mode;
fs/xfs/xfs_iops.c +2 -2
@@ -574,7 +574,7 @@ xfs_vn_getattr( stat->ino = ip->i_ino; stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; - stat->ctime = inode->i_ctime; + stat->ctime =inode_get_ctime (inode); stat->blocks =XFS_FSB_TO_BB (mp, ip->i_nblocks + ip->i_delayed_blks);if (xfs_has_v3inodes (mp)) {
@@ -1055,7 +1055,7 @@ xfs_vn_update_time(xfs_ilock (ip,XFS_ILOCK_EXCL );if (flags &S_CTIME ) - inode->i_ctime = *now; +inode_set_ctime_to_ts (inode, *now);if (flags &S_MTIME ) inode->i_mtime = *now;if (flags &S_ATIME )
fs/xfs/xfs_itable.c +2 -2
@@ -100,8 +100,8 @@ xfs_bulkstat_one_int( buf->bs_atime_nsec = inode->i_atime.tv_nsec; buf->bs_mtime = inode->i_mtime.tv_sec; buf->bs_mtime_nsec = inode->i_mtime.tv_nsec; - buf->bs_ctime = inode->i_ctime.tv_sec; - buf->bs_ctime_nsec = inode->i_ctime.tv_nsec; + buf->bs_ctime =inode_get_ctime (inode).tv_sec; + buf->bs_ctime_nsec =inode_get_ctime (inode).tv_nsec; buf->bs_gen = inode->i_generation; buf->bs_mode = inode->i_mode;
Signature · 1 line
2.41.0
Re: [PATCH v2 82/92] xfs: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 153 lines
--- fs/xfs/libxfs/xfs_inode_buf.c | 5 +++-- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_bmap_util.c | 6 ++++-- fs/xfs/xfs_inode.c | 3 +-- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_iops.c | 4 ++-- fs/xfs/xfs_itable.c | 4 ++-- 8 files changed, 15 insertions(+), 13 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +3
-2@@ -222,7 +222,8 @@ xfs_inode_from_disk(*/ inode->i_atime =xfs_inode_from_disk_ts (from, from->di_atime); inode->i_mtime =xfs_inode_from_disk_ts (from, from->di_mtime); - inode->i_ctime =xfs_inode_from_disk_ts (from, from->di_ctime); +inode_set_ctime_to_ts (inode, +xfs_inode_from_disk_ts (from, from->di_ctime)); ip->i_disk_size =be64_to_cpu (from->di_size); ip->i_nblocks =be64_to_cpu (from->di_nblocks);@@ -316,7 +317,7 @@ xfs_inode_to_disk( to->di_atime =xfs_inode_to_disk_ts (ip, inode->i_atime); to->di_mtime =xfs_inode_to_disk_ts (ip, inode->i_mtime); - to->di_ctime =xfs_inode_to_disk_ts (ip, inode->i_ctime); + to->di_ctime =xfs_inode_to_disk_ts (ip,inode_get_ctime (inode)); to->di_nlink =cpu_to_be32 (inode->i_nlink); to->di_gen =cpu_to_be32 (inode->i_generation); to->di_mode =cpu_to_be16 (inode->i_mode);fs/xfs/libxfs/xfs_trans_inode.c +1
-1@@ -67,7 +67,7 @@ xfs_trans_ichgtime(if (flags &XFS_ICHGTIME_MOD ) inode->i_mtime = tv;if (flags &XFS_ICHGTIME_CHG ) - inode->i_ctime = tv; +inode_set_ctime_to_ts (inode, tv);if (flags &XFS_ICHGTIME_CREATE ) ip->i_crtime = tv; }fs/xfs/xfs_acl.c +1
-1@@ -233,7 +233,7 @@ xfs_acl_set_mode(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); inode->i_mode = mode; - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );if (xfs_has_wsync (mp))fs/xfs/xfs_bmap_util.c +4
-2@@ -1644,6 +1644,7 @@ xfs_swap_extents(uint64_t f;int resblks =0 ;unsigned int flags =0 ; +struct timespec64 ctime;/* * Lock the inodes against other IO, page faults and truncate to @@ -1756,8 +1757,9 @@ xfs_swap_extents(* process that the file was not changed out from * under it. */ -if ((sbp->bs_ctime.tv_sec !=VFS_I (ip)->i_ctime.tv_sec) || - (sbp->bs_ctime.tv_nsec !=VFS_I (ip)->i_ctime.tv_nsec) || + ctime =inode_get_ctime (VFS_I (ip)); +if ((sbp->bs_ctime.tv_sec != ctime.tv_sec) || + (sbp->bs_ctime.tv_nsec != ctime.tv_nsec) || (sbp->bs_mtime.tv_sec !=VFS_I (ip)->i_mtime.tv_sec) || (sbp->bs_mtime.tv_nsec !=VFS_I (ip)->i_mtime.tv_nsec)) { error = -EBUSY ;fs/xfs/xfs_inode.c +1
-2@@ -843,10 +843,9 @@ xfs_init_new_inode( ip->i_df.if_nextents =0 ;ASSERT (ip->i_nblocks ==0 ); - tv =current_time (inode); + tv =inode_set_ctime_current (inode); inode->i_mtime = tv; inode->i_atime = tv; - inode->i_ctime = tv; ip->i_extsize =0 ; ip->i_diflags =0 ;fs/xfs/xfs_inode_item.c +1
-1@@ -528,7 +528,7 @@ xfs_inode_to_log_dinode(memset (to->di_pad3,0 ,sizeof (to->di_pad3)); to->di_atime =xfs_inode_to_log_dinode_ts (ip, inode->i_atime); to->di_mtime =xfs_inode_to_log_dinode_ts (ip, inode->i_mtime); - to->di_ctime =xfs_inode_to_log_dinode_ts (ip, inode->i_ctime); + to->di_ctime =xfs_inode_to_log_dinode_ts (ip,inode_get_ctime (inode)); to->di_nlink = inode->i_nlink; to->di_gen = inode->i_generation; to->di_mode = inode->i_mode;fs/xfs/xfs_iops.c +2
-2@@ -574,7 +574,7 @@ xfs_vn_getattr( stat->ino = ip->i_ino; stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; - stat->ctime = inode->i_ctime; + stat->ctime =inode_get_ctime (inode); stat->blocks =XFS_FSB_TO_BB (mp, ip->i_nblocks + ip->i_delayed_blks);if (xfs_has_v3inodes (mp)) {@@ -1055,7 +1055,7 @@ xfs_vn_update_time(xfs_ilock (ip,XFS_ILOCK_EXCL );if (flags &S_CTIME ) - inode->i_ctime = *now; +inode_set_ctime_to_ts (inode, *now);if (flags &S_MTIME ) inode->i_mtime = *now;if (flags &S_ATIME )fs/xfs/xfs_itable.c +2
-2@@ -100,8 +100,8 @@ xfs_bulkstat_one_int( buf->bs_atime_nsec = inode->i_atime.tv_nsec; buf->bs_mtime = inode->i_mtime.tv_sec; buf->bs_mtime_nsec = inode->i_mtime.tv_nsec; - buf->bs_ctime = inode->i_ctime.tv_sec; - buf->bs_ctime_nsec = inode->i_ctime.tv_nsec; + buf->bs_ctime =inode_get_ctime (inode).tv_sec; + buf->bs_ctime_nsec =inode_get_ctime (inode).tv_nsec; buf->bs_gen = inode->i_generation; buf->bs_mode = inode->i_mode;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 83/92 zonefs: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- fs/zonefs/super.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/zonefs/super.c +5 -3
@@ -658,7 +658,8 @@ static struct inode *zonefs_get_file_inode(struct inode *dir, inode->i_ino = ino; inode->i_mode = z->z_mode; - inode->i_ctime = inode->i_mtime = inode->i_atime = dir->i_ctime; + inode->i_mtime = inode->i_atime =inode_set_ctime_to_ts (inode, +inode_get_ctime (dir)); inode->i_uid = z->z_uid; inode->i_gid = z->z_gid; inode->i_size = z->z_wpoffset;
@@ -694,7 +695,8 @@ static struct inode *zonefs_get_zgroup_inode(struct super_block *sb, inode->i_ino = ino;inode_init_owner (&nop_mnt_idmap, inode, root,S_IFDIR |0555 ); inode->i_size = sbi->s_zgroup[ztype].g_nr_zones; - inode->i_ctime = inode->i_mtime = inode->i_atime = root->i_ctime; + inode->i_mtime = inode->i_atime =inode_set_ctime_to_ts (inode, +inode_get_ctime (root)); inode->i_private = &sbi->s_zgroup[ztype];set_nlink (inode,2 );
@@ -1317,7 +1319,7 @@ static int zonefs_fill_super(struct super_block *sb, void *data, int silent) inode->i_ino =bdev_nr_zones (sb->s_bdev); inode->i_mode =S_IFDIR |0555 ; - inode->i_ctime = inode->i_mtime = inode->i_atime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_op = &zonefs_dir_inode_operations; inode->i_fop = &zonefs_dir_operations; inode->i_size =2 ;
Signature · 1 line
2.41.0
Re: [PATCH v2 83/92] zonefs: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Damien Le Moal <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 40 lines
--- fs/zonefs/super.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)fs/zonefs/super.c +5
-3@@ -658,7 +658,8 @@ static struct inode *zonefs_get_file_inode(struct inode *dir, inode->i_ino = ino; inode->i_mode = z->z_mode; - inode->i_ctime = inode->i_mtime = inode->i_atime = dir->i_ctime; + inode->i_mtime = inode->i_atime =inode_set_ctime_to_ts (inode, +inode_get_ctime (dir)); inode->i_uid = z->z_uid; inode->i_gid = z->z_gid; inode->i_size = z->z_wpoffset;@@ -694,7 +695,8 @@ static struct inode *zonefs_get_zgroup_inode(struct super_block *sb, inode->i_ino = ino;inode_init_owner (&nop_mnt_idmap, inode, root,S_IFDIR |0555 ); inode->i_size = sbi->s_zgroup[ztype].g_nr_zones; - inode->i_ctime = inode->i_mtime = inode->i_atime = root->i_ctime; + inode->i_mtime = inode->i_atime =inode_set_ctime_to_ts (inode, +inode_get_ctime (root)); inode->i_private = &sbi->s_zgroup[ztype];set_nlink (inode,2 );@@ -1317,7 +1319,7 @@ static int zonefs_fill_super(struct super_block *sb, void *data, int silent) inode->i_ino =bdev_nr_zones (sb->s_bdev); inode->i_mode =S_IFDIR |0555 ; - inode->i_ctime = inode->i_mtime = inode->i_atime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode); inode->i_op = &zonefs_dir_inode_operations; inode->i_fop = &zonefs_dir_operations; inode->i_size =2 ;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 84/92 linux: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- include/linux/fs_stack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fs_stack.h +1 -1
@@ -24,7 +24,7 @@ static inline void fsstack_copy_attr_times(struct inode *dest, { dest->i_atime = src->i_atime; dest->i_mtime = src->i_mtime; - dest->i_ctime = src->i_ctime; +inode_set_ctime_to_ts (dest,inode_get_ctime (src)); }#endif /* _LINUX_FS_STACK_H */
Signature · 1 line
2.41.0
Re: [PATCH v2 84/92] linux: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- include/linux/fs_stack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/fs_stack.h +1
-1@@ -24,7 +24,7 @@ static inline void fsstack_copy_attr_times(struct inode *dest, { dest->i_atime = src->i_atime; dest->i_mtime = src->i_mtime; - dest->i_ctime = src->i_ctime; +inode_set_ctime_to_ts (dest,inode_get_ctime (src)); }#endif /* _LINUX_FS_STACK_H */ Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerRe: [PATCH v2 84/92] linux: convert to ctime accessor functions
Quoted 5 lines · Jan Kara
Quoted 4 lines · Jeff Layton
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.
Quoted 8 lines
Quoted 1 line
Signed-off-by Jeff Layton <[email protected]>Looks good. Feel free to add:
Reviewed-by Jan Kara <[email protected]>Honza
I'll fix the subject line on this one too, which should be "fs_stack:". Many thanks for all of the review!
Quoted 20 lines
Quoted 20 lines
--- include/linux/fs_stack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/fs_stack.h +1
-1@@ -24,7 +24,7 @@ static inline void fsstack_copy_attr_times(struct inode *dest, { dest->i_atime = src->i_atime; dest->i_mtime = src->i_mtime; - dest->i_ctime = src->i_ctime; +inode_set_ctime_to_ts (dest,inode_get_ctime (src)); }#endif /* _LINUX_FS_STACK_H */ Signature · 1 line
2.41.0
Signature · 1 line
Jeff Layton <[email protected]>
Jeff Layton
maintainerPATCH v2 85/92 mqueue: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- ipc/mqueue.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
ipc/mqueue.c +11 -12
@@ -302,7 +302,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, inode->i_mode = mode; inode->i_uid =current_fsuid (); inode->i_gid =current_fsgid (); - inode->i_mtime = inode->i_ctime = inode->i_atime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode);if (S_ISREG (mode)) {struct mqueue_inode_info *info;
@@ -596,7 +596,7 @@ static int mqueue_create_attr(struct dentry *dentry, umode_t mode, void *arg)put_ipc_ns (ipc_ns); dir->i_size +=DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime = dir->i_atime =current_time (dir); + dir->i_mtime = dir->i_atime =inode_set_ctime_current (dir);d_instantiate (dentry, inode);dget (dentry);
@@ -618,7 +618,7 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry) {struct inode *inode =d_inode (dentry); - dir->i_ctime = dir->i_mtime = dir->i_atime =current_time (dir); + dir->i_mtime = dir->i_atime =inode_set_ctime_current (dir); dir->i_size -=DIRENT_SIZE ;drop_nlink (inode);dput (dentry);
@@ -635,7 +635,8 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)static ssize_t mqueue_read_file (struct file *filp,char __user *u_data,size_t count,loff_t *off) { -struct mqueue_inode_info *info =MQUEUE_I (file_inode (filp)); +struct inode *inode =file_inode (filp); +struct mqueue_inode_info *info =MQUEUE_I (inode);char buffer[FILENT_SIZE ];ssize_t ret;
@@ -656,7 +657,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,if (ret <=0 )return ret; -file_inode (filp)->i_atime =file_inode (filp)->i_ctime =current_time (file_inode (filp)); + inode->i_atime =inode_set_ctime_current (inode);return ret; }
@@ -1162,8 +1163,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, goto out_unlock;__do_notify (info); } - inode->i_atime = inode->i_mtime = inode->i_ctime = -current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); } out_unlock:spin_unlock (&info->lock);
@@ -1257,8 +1257,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, msg_ptr =msg_get (info); - inode->i_atime = inode->i_mtime = inode->i_ctime = -current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);/* There is now free space in queue. */ pipelined_receive (&wake_q, info);
@@ -1396,7 +1395,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)if (notification ==NULL ) {if (info->notify_owner ==task_tgid (current)) {remove_notification (info); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); } }else if (info->notify_owner !=NULL ) { ret = -EBUSY ;
@@ -1422,7 +1421,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification) info->notify_owner =get_pid (task_tgid (current)); info->notify_user_ns =get_user_ns (current_user_ns ()); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); }spin_unlock (&info->lock); out_fput:
@@ -1485,7 +1484,7 @@ static int do_mq_getsetattr(int mqdes, struct mq_attr *new, struct mq_attr *old) f.file->f_flags &= ~O_NONBLOCK ;spin_unlock (&f.file->f_lock); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); }spin_unlock (&info->lock);
Signature · 1 line
2.41.0
Re: [PATCH v2 85/92] mqueue: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 104 lines
--- ipc/mqueue.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)ipc/mqueue.c +11
-12@@ -302,7 +302,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, inode->i_mode = mode; inode->i_uid =current_fsuid (); inode->i_gid =current_fsgid (); - inode->i_mtime = inode->i_ctime = inode->i_atime =current_time (inode); + inode->i_mtime = inode->i_atime =inode_set_ctime_current (inode);if (S_ISREG (mode)) {struct mqueue_inode_info *info;@@ -596,7 +596,7 @@ static int mqueue_create_attr(struct dentry *dentry, umode_t mode, void *arg)put_ipc_ns (ipc_ns); dir->i_size +=DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime = dir->i_atime =current_time (dir); + dir->i_mtime = dir->i_atime =inode_set_ctime_current (dir);d_instantiate (dentry, inode);dget (dentry);@@ -618,7 +618,7 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry) {struct inode *inode =d_inode (dentry); - dir->i_ctime = dir->i_mtime = dir->i_atime =current_time (dir); + dir->i_mtime = dir->i_atime =inode_set_ctime_current (dir); dir->i_size -=DIRENT_SIZE ;drop_nlink (inode);dput (dentry);@@ -635,7 +635,8 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)static ssize_t mqueue_read_file (struct file *filp,char __user *u_data,size_t count,loff_t *off) { -struct mqueue_inode_info *info =MQUEUE_I (file_inode (filp)); +struct inode *inode =file_inode (filp); +struct mqueue_inode_info *info =MQUEUE_I (inode);char buffer[FILENT_SIZE ];ssize_t ret;@@ -656,7 +657,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,if (ret <=0 )return ret; -file_inode (filp)->i_atime =file_inode (filp)->i_ctime =current_time (file_inode (filp)); + inode->i_atime =inode_set_ctime_current (inode);return ret; }@@ -1162,8 +1163,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, goto out_unlock;__do_notify (info); } - inode->i_atime = inode->i_mtime = inode->i_ctime = -current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); } out_unlock:spin_unlock (&info->lock);@@ -1257,8 +1257,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, msg_ptr =msg_get (info); - inode->i_atime = inode->i_mtime = inode->i_ctime = -current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);/* There is now free space in queue. */ pipelined_receive (&wake_q, info);@@ -1396,7 +1395,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)if (notification ==NULL ) {if (info->notify_owner ==task_tgid (current)) {remove_notification (info); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); } }else if (info->notify_owner !=NULL ) { ret = -EBUSY ;@@ -1422,7 +1421,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification) info->notify_owner =get_pid (task_tgid (current)); info->notify_user_ns =get_user_ns (current_user_ns ()); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); }spin_unlock (&info->lock); out_fput:@@ -1485,7 +1484,7 @@ static int do_mq_getsetattr(int mqdes, struct mq_attr *new, struct mq_attr *old) f.file->f_flags &= ~O_NONBLOCK ;spin_unlock (&f.file->f_lock); - inode->i_atime = inode->i_ctime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); }spin_unlock (&info->lock);Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 86/92 bpf: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- kernel/bpf/inode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/bpf/inode.c +2 -4
@@ -118,9 +118,8 @@ static struct inode *bpf_get_inode(struct super_block *sb,return ERR_PTR (-ENOSPC ); inode->i_ino =get_next_ino (); - inode->i_atime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); inode->i_mtime = inode->i_atime; - inode->i_ctime = inode->i_atime;inode_init_owner (&nop_mnt_idmap, inode, dir, mode);
@@ -148,8 +147,7 @@ static void bpf_dentry_finalize(struct dentry *dentry, struct inode *inode,d_instantiate (dentry, inode);dget (dentry); - dir->i_mtime =current_time (dir); - dir->i_ctime = dir->i_mtime; + dir->i_mtime =inode_set_ctime_current (dir); } static int bpf_mkdir(struct mnt_idmap *idmap, struct inode *dir,
Signature · 1 line
2.41.0
Re: [PATCH v2 86/92] bpf: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 32 lines
--- kernel/bpf/inode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)kernel/bpf/inode.c +2
-4@@ -118,9 +118,8 @@ static struct inode *bpf_get_inode(struct super_block *sb,return ERR_PTR (-ENOSPC ); inode->i_ino =get_next_ino (); - inode->i_atime =current_time (inode); + inode->i_atime =inode_set_ctime_current (inode); inode->i_mtime = inode->i_atime; - inode->i_ctime = inode->i_atime;inode_init_owner (&nop_mnt_idmap, inode, dir, mode);@@ -148,8 +147,7 @@ static void bpf_dentry_finalize(struct dentry *dentry, struct inode *inode,d_instantiate (dentry, inode);dget (dentry); - dir->i_mtime =current_time (dir); - dir->i_ctime = dir->i_mtime; + dir->i_mtime =inode_set_ctime_current (dir); } static int bpf_mkdir(struct mnt_idmap *idmap, struct inode *dir,Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 87/92 shmem: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- mm/shmem.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
mm/shmem.c +12 -10
@@ -1064,7 +1064,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,void shmem_truncate_range (struct inode *inode,loff_t lstart,loff_t lend) {shmem_undo_range (inode, lstart, lend, false); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);inode_inc_iversion (inode); }EXPORT_SYMBOL_GPL (shmem_truncate_range);
@@ -1161,9 +1161,9 @@ static int shmem_setattr(struct mnt_idmap *idmap,if (attr->ia_valid &ATTR_MODE ) error =posix_acl_chmod (idmap, dentry, inode->i_mode);if (!error && update_ctime) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (update_mtime) - inode->i_mtime = inode->i_ctime; + inode->i_mtime =inode_get_ctime (inode);inode_inc_iversion (inode); }return error;
@@ -2394,7 +2394,7 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block inode->i_ino = ino;inode_init_owner (idmap, inode, dir, mode); inode->i_blocks =0 ; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_generation =get_random_u32 (); info =SHMEM_I (inode);memset (info,0 , (char *)inode - (char *)info);
@@ -3110,7 +3110,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, goto out_iput; dir->i_size +=BOGO_DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);inode_inc_iversion (dir);d_instantiate (dentry, inode);dget (dentry);/* Extra count - pin the dentry in core */
@@ -3193,7 +3193,8 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr } dir->i_size +=BOGO_DIRENT_SIZE ; - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));inode_inc_iversion (dir);inc_nlink (inode);ihold (inode);/* New dentry reference */
@@ -3213,7 +3214,8 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)simple_offset_remove (shmem_get_offset_ctx (dir), dentry); dir->i_size -=BOGO_DIRENT_SIZE ; - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));inode_inc_iversion (dir);drop_nlink (inode);dput (dentry);/* Undo the count from "create" - this does all the work */
@@ -3360,7 +3362,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir,folio_put (folio); } dir->i_size +=BOGO_DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);inode_inc_iversion (dir);d_instantiate (dentry, inode);dget (dentry);
@@ -3438,7 +3440,7 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap, (fa->flags &SHMEM_FL_USER_MODIFIABLE );shmem_set_inode_flags (inode, info->fsflags); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_iversion (inode);return 0 ; }
@@ -3508,7 +3510,7 @@ static int shmem_xattr_handler_set(const struct xattr_handler *handler, name =xattr_full_name (handler, name); err =simple_xattr_set (&info->xattrs, name, value, size, flags,NULL );if (!err) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_iversion (inode); }return err;
Signature · 1 line
2.41.0
Re: [PATCH v2 87/92] shmem: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 97 lines
--- mm/shmem.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)mm/shmem.c +12
-10@@ -1064,7 +1064,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,void shmem_truncate_range (struct inode *inode,loff_t lstart,loff_t lend) {shmem_undo_range (inode, lstart, lend, false); - inode->i_ctime = inode->i_mtime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode);inode_inc_iversion (inode); }EXPORT_SYMBOL_GPL (shmem_truncate_range);@@ -1161,9 +1161,9 @@ static int shmem_setattr(struct mnt_idmap *idmap,if (attr->ia_valid &ATTR_MODE ) error =posix_acl_chmod (idmap, dentry, inode->i_mode);if (!error && update_ctime) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);if (update_mtime) - inode->i_mtime = inode->i_ctime; + inode->i_mtime =inode_get_ctime (inode);inode_inc_iversion (inode); }return error;@@ -2394,7 +2394,7 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block inode->i_ino = ino;inode_init_owner (idmap, inode, dir, mode); inode->i_blocks =0 ; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_generation =get_random_u32 (); info =SHMEM_I (inode);memset (info,0 , (char *)inode - (char *)info);@@ -3110,7 +3110,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, goto out_iput; dir->i_size +=BOGO_DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);inode_inc_iversion (dir);d_instantiate (dentry, inode);dget (dentry);/* Extra count - pin the dentry in core */ @@ -3193,7 +3193,8 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr } dir->i_size +=BOGO_DIRENT_SIZE ; - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));inode_inc_iversion (dir);inc_nlink (inode);ihold (inode);/* New dentry reference */ @@ -3213,7 +3214,8 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)simple_offset_remove (shmem_get_offset_ctx (dir), dentry); dir->i_size -=BOGO_DIRENT_SIZE ; - inode->i_ctime = dir->i_ctime = dir->i_mtime =current_time (inode); + dir->i_mtime =inode_set_ctime_to_ts (dir, +inode_set_ctime_current (inode));inode_inc_iversion (dir);drop_nlink (inode);dput (dentry);/* Undo the count from "create" - this does all the work */ @@ -3360,7 +3362,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir,folio_put (folio); } dir->i_size +=BOGO_DIRENT_SIZE ; - dir->i_ctime = dir->i_mtime =current_time (dir); + dir->i_mtime =inode_set_ctime_current (dir);inode_inc_iversion (dir);d_instantiate (dentry, inode);dget (dentry);@@ -3438,7 +3440,7 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap, (fa->flags &SHMEM_FL_USER_MODIFIABLE );shmem_set_inode_flags (inode, info->fsflags); - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_iversion (inode);return 0 ; }@@ -3508,7 +3510,7 @@ static int shmem_xattr_handler_set(const struct xattr_handler *handler, name =xattr_full_name (handler, name); err =simple_xattr_set (&info->xattrs, name, value, size, flags,NULL );if (!err) { - inode->i_ctime =current_time (inode); +inode_set_ctime_current (inode);inode_inc_iversion (inode); }return err;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 88/92 sunrpc: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- net/sunrpc/rpc_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/rpc_pipe.c +1 -1
@@ -472,7 +472,7 @@ rpc_get_inode(struct super_block *sb, umode_t mode)return NULL ; inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {case S_IFDIR : inode->i_fop = &simple_dir_operations;
Signature · 1 line
2.41.0
Re: [PATCH v2 88/92] sunrpc: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- net/sunrpc/rpc_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/sunrpc/rpc_pipe.c +1
-1@@ -472,7 +472,7 @@ rpc_get_inode(struct super_block *sb, umode_t mode)return NULL ; inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);switch (mode &S_IFMT ) {case S_IFDIR : inode->i_fop = &simple_dir_operations;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 89/92 apparmor: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- security/apparmor/apparmorfs.c | 6 +++--- security/apparmor/policy_unpack.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
security/apparmor/apparmorfs.c +3 -3
@@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry, inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_private = data;if (S_ISDIR (mode)) { inode->i_op = iops ? iops : &simple_dir_inode_operations;
@@ -1557,7 +1557,7 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,if (new->dents[i]) {struct inode *inode =d_inode (new->dents[i]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); } old->dents[i] =NULL ; }
@@ -2546,7 +2546,7 @@ static int aa_mk_null_file(struct dentry *parent) inode->i_ino =get_next_ino (); inode->i_mode =S_IFCHR |S_IRUGO |S_IWUGO ; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);init_special_inode (inode,S_IFCHR |S_IRUGO |S_IWUGO ,MKDEV (MEM_MAJOR ,3 ));d_instantiate (dentry, inode);
security/apparmor/policy_unpack.c +2 -2
@@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)struct inode *inode; inode =d_inode (data->dents[AAFS_LOADDATA_DIR ]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); inode =d_inode (data->dents[AAFS_LOADDATA_REVISION ]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); } }
Signature · 1 line
2.41.0
Re: [PATCH v2 89/92] apparmor: convert to ctime accessor functions
Quoted 5 lines · Jeff Layton
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.Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 56 lines
--- security/apparmor/apparmorfs.c | 6 +++--- security/apparmor/policy_unpack.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)security/apparmor/apparmorfs.c +3
-3@@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry, inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_private = data;if (S_ISDIR (mode)) { inode->i_op = iops ? iops : &simple_dir_inode_operations;@@ -1557,7 +1557,7 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,if (new->dents[i]) {struct inode *inode =d_inode (new->dents[i]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); } old->dents[i] =NULL ; }@@ -2546,7 +2546,7 @@ static int aa_mk_null_file(struct dentry *parent) inode->i_ino =get_next_ino (); inode->i_mode =S_IFCHR |S_IRUGO |S_IWUGO ; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode);init_special_inode (inode,S_IFCHR |S_IRUGO |S_IWUGO ,MKDEV (MEM_MAJOR ,3 ));d_instantiate (dentry, inode);security/apparmor/policy_unpack.c +2
-2@@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision)struct inode *inode; inode =d_inode (data->dents[AAFS_LOADDATA_DIR ]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); inode =d_inode (data->dents[AAFS_LOADDATA_REVISION ]); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =inode_set_ctime_current (inode); } }Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 90/92 security: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- security/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/inode.c +1 -1
@@ -145,7 +145,7 @@ static struct dentry *securityfs_create_dentry(const char *name, umode_t mode, inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_private = data;if (S_ISDIR (mode)) { inode->i_op = &simple_dir_inode_operations;
Signature · 1 line
2.41.0
Re: [PATCH v2 90/92] security: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Paul Moore <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- security/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)security/inode.c +1
-1@@ -145,7 +145,7 @@ static struct dentry *securityfs_create_dentry(const char *name, umode_t mode, inode->i_ino =get_next_ino (); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_atime = inode->i_mtime =inode_set_ctime_current (inode); inode->i_private = data;if (S_ISDIR (mode)) { inode->i_op = &simple_dir_inode_operations;Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jeff Layton
maintainerPATCH v2 91/92 selinux: convert to ctime accessor functions
In reply to Jeff LaytonIn 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.
--- security/selinux/selinuxfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/selinuxfs.c +1 -1
@@ -1197,7 +1197,7 @@ static struct inode *sel_make_inode(struct super_block *sb, int mode)if (ret) { ret->i_mode = mode; - ret->i_atime = ret->i_mtime = ret->i_ctime =current_time (ret); + ret->i_atime = ret->i_mtime =inode_set_ctime_current (ret); }return ret; }
Signature · 1 line
2.41.0
Re: [PATCH v2 91/92] selinux: convert to ctime accessor functions
Quoted 6 lines · Jeff Layton
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 Paul Moore <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 20 lines
--- security/selinux/selinuxfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)security/selinux/selinuxfs.c +1
-1@@ -1197,7 +1197,7 @@ static struct inode *sel_make_inode(struct super_block *sb, int mode)if (ret) { ret->i_mode = mode; - ret->i_atime = ret->i_mtime = ret->i_ctime =current_time (ret); + ret->i_atime = ret->i_mtime =inode_set_ctime_current (ret); }return ret; }Signature · 1 line
2.41.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR