Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 05:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

affs: convert to new timestamp accessors

Browse Source 
Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-15-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jeff Layton 2023-10-04 14:52:02 -04:00 committed by Christian Brauner
parent ca9649e9bd
commit ea7719af1b
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/affs/amigaffs.c
View File

@ -60,7 +60,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
mark_buffer_dirty_inode(dir_bh, dir); mark_buffer_dirty_inode(dir_bh, dir);
affs_brelse(dir_bh); affs_brelse(dir_bh);
dir->i_mtime = inode_set_ctime_current(dir); inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
inode_inc_iversion(dir); inode_inc_iversion(dir);
mark_inode_dirty(dir); mark_inode_dirty(dir);
@ -114,7 +114,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
affs_brelse(bh); affs_brelse(bh);
dir->i_mtime = inode_set_ctime_current(dir); inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
inode_inc_iversion(dir); inode_inc_iversion(dir);
mark_inode_dirty(dir); mark_inode_dirty(dir);

17
fs/affs/inode.c
View File

@ -149,13 +149,9 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
break; break;
} }
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_mtime(inode,
inode_set_ctime(inode, inode_set_atime(inode, inode_set_ctime(inode, (be32_to_cpu(tail->change.days) * 86400LL + be32_to_cpu(tail->change.mins) * 60 + be32_to_cpu(tail->change.ticks) / 50 + AFFS_EPOCH_DELTA) + sys_tz.tz_minuteswest * 60, 0).tv_sec, 0).tv_sec,
(be32_to_cpu(tail->change.days) * 86400LL + 0);
be32_to_cpu(tail->change.mins) * 60 +
be32_to_cpu(tail->change.ticks) / 50 + AFFS_EPOCH_DELTA)
+ sys_tz.tz_minuteswest * 60, 0).tv_sec;
inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
affs_brelse(bh); affs_brelse(bh);
unlock_new_inode(inode); unlock_new_inode(inode);
return inode; return inode;
@ -187,12 +183,13 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
} }
tail = AFFS_TAIL(sb, bh); tail = AFFS_TAIL(sb, bh);
if (tail->stype == cpu_to_be32(ST_ROOT)) { if (tail->stype == cpu_to_be32(ST_ROOT)) {
affs_secs_to_datestamp(inode->i_mtime.tv_sec, affs_secs_to_datestamp(inode_get_mtime_sec(inode),
&AFFS_ROOT_TAIL(sb, bh)->root_change); &AFFS_ROOT_TAIL(sb, bh)->root_change);
} else { } else {
tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect); tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect);
tail->size = cpu_to_be32(inode->i_size); tail->size = cpu_to_be32(inode->i_size);
affs_secs_to_datestamp(inode->i_mtime.tv_sec, &tail->change); affs_secs_to_datestamp(inode_get_mtime_sec(inode),
&tail->change);
if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) { if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
uid = i_uid_read(inode); uid = i_uid_read(inode);
gid = i_gid_read(inode); gid = i_gid_read(inode);
@ -314,7 +311,7 @@ affs_new_inode(struct inode *dir)
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
inode->i_ino = block; inode->i_ino = block;
set_nlink(inode, 1); set_nlink(inode, 1);
inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); simple_inode_init_ts(inode);
atomic_set(&AFFS_I(inode)->i_opencnt, 0); atomic_set(&AFFS_I(inode)->i_opencnt, 0);
AFFS_I(inode)->i_blkcnt = 0; AFFS_I(inode)->i_blkcnt = 0;
AFFS_I(inode)->i_lc = NULL; AFFS_I(inode)->i_lc = NULL;