korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bfs: convert to ctime accessor functions

Browse Source 
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 <jlayton@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-26-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jeff Layton 2023-07-05 15:00:53 -04:00 committed by Christian Brauner
parent 0a83594824
commit 73d9b9d028
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/bfs/dir.c
View File

@ -97,7 +97,7 @@ static int bfs_create(struct mnt_idmap *idmap, struct inode *dir,
set_bit(ino, info->si_imap); set_bit(ino, info->si_imap);
info->si_freei--; info->si_freei--;
inode_init_owner(&nop_mnt_idmap, inode, dir, mode); 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_blocks = 0; inode->i_blocks = 0;
inode->i_op = &bfs_file_inops; inode->i_op = &bfs_file_inops;
inode->i_fop = &bfs_file_operations; inode->i_fop = &bfs_file_operations;
@ -158,7 +158,7 @@ static int bfs_link(struct dentry *old, struct inode *dir,
return err; return err;
} }
inc_nlink(inode); inc_nlink(inode);
inode->i_ctime = current_time(inode); inode_set_ctime_current(inode);
mark_inode_dirty(inode); mark_inode_dirty(inode);
ihold(inode); ihold(inode);
d_instantiate(new, inode); d_instantiate(new, inode);
@ -187,9 +187,9 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry)
} }
de->ino = 0; de->ino = 0;
mark_buffer_dirty_inode(bh, dir); mark_buffer_dirty_inode(bh, dir);
dir->i_ctime = dir->i_mtime = current_time(dir); dir->i_mtime = inode_set_ctime_current(dir);
mark_inode_dirty(dir); mark_inode_dirty(dir);
inode->i_ctime = dir->i_ctime; inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
inode_dec_link_count(inode); inode_dec_link_count(inode);
error = 0; error = 0;
@ -240,10 +240,10 @@ static int bfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
goto end_rename; goto end_rename;
} }
old_de->ino = 0; old_de->ino = 0;
old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir); old_dir->i_mtime = inode_set_ctime_current(old_dir);
mark_inode_dirty(old_dir); mark_inode_dirty(old_dir);
if (new_inode) { if (new_inode) {
new_inode->i_ctime = current_time(new_inode); inode_set_ctime_current(new_inode);
inode_dec_link_count(new_inode); inode_dec_link_count(new_inode);
} }
mark_buffer_dirty_inode(old_bh, old_dir); mark_buffer_dirty_inode(old_bh, old_dir);
@ -292,9 +292,9 @@ static int bfs_add_entry(struct inode *dir, const struct qstr *child, int ino)
pos = (block - sblock) * BFS_BSIZE + off; pos = (block - sblock) * BFS_BSIZE + off;
if (pos >= dir->i_size) { if (pos >= dir->i_size) {
dir->i_size += BFS_DIRENT_SIZE; dir->i_size += BFS_DIRENT_SIZE;
dir->i_ctime = current_time(dir); inode_set_ctime_current(dir);
} }
dir->i_mtime = dir->i_ctime = current_time(dir); dir->i_mtime = inode_set_ctime_current(dir);
mark_inode_dirty(dir); mark_inode_dirty(dir);
de->ino = cpu_to_le16((u16)ino); de->ino = cpu_to_le16((u16)ino);
for (i = 0; i < BFS_NAMELEN; i++) for (i = 0; i < BFS_NAMELEN; i++)

5
fs/bfs/inode.c
View File

@ -82,10 +82,9 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
inode->i_blocks = BFS_FILEBLOCKS(di); inode->i_blocks = BFS_FILEBLOCKS(di);
inode->i_atime.tv_sec = le32_to_cpu(di->i_atime); inode->i_atime.tv_sec = le32_to_cpu(di->i_atime);
inode->i_mtime.tv_sec = le32_to_cpu(di->i_mtime); inode->i_mtime.tv_sec = le32_to_cpu(di->i_mtime);
inode->i_ctime.tv_sec = le32_to_cpu(di->i_ctime); inode_set_ctime(inode, le32_to_cpu(di->i_ctime), 0);
inode->i_atime.tv_nsec = 0; inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0; inode->i_mtime.tv_nsec = 0;
inode->i_ctime.tv_nsec = 0;
brelse(bh); brelse(bh);
unlock_new_inode(inode); unlock_new_inode(inode);
@ -143,7 +142,7 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
di->i_nlink = cpu_to_le32(inode->i_nlink); di->i_nlink = cpu_to_le32(inode->i_nlink);
di->i_atime = cpu_to_le32(inode->i_atime.tv_sec); di->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec); di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
di->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec); di->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec);
i_sblock = BFS_I(inode)->i_sblock; i_sblock = BFS_I(inode)->i_sblock;
di->i_sblock = cpu_to_le32(i_sblock); di->i_sblock = cpu_to_le32(i_sblock);
di->i_eblock = cpu_to_le32(BFS_I(inode)->i_eblock); di->i_eblock = cpu_to_le32(BFS_I(inode)->i_eblock);