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

jfs: convert to new timestamp accessors

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

Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-46-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jeff Layton 2023-10-04 14:52:33 -04:00 committed by Christian Brauner
parent 95af66c497
commit dc34d1330c
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
5 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jfs/inode.c
View File

@ -393,7 +393,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length)
break; break;
} }
ip->i_mtime = inode_set_ctime_current(ip); inode_set_mtime_to_ts(ip, inode_set_ctime_current(ip));
mark_inode_dirty(ip); mark_inode_dirty(ip);
txCommit(tid, 1, &ip, 0); txCommit(tid, 1, &ip, 0);

20
fs/jfs/jfs_imap.c
View File

@ -3061,10 +3061,10 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
} }
ip->i_size = le64_to_cpu(dip->di_size); ip->i_size = le64_to_cpu(dip->di_size);
ip->i_atime.tv_sec = le32_to_cpu(dip->di_atime.tv_sec); inode_set_atime(ip, le32_to_cpu(dip->di_atime.tv_sec),
ip->i_atime.tv_nsec = le32_to_cpu(dip->di_atime.tv_nsec); le32_to_cpu(dip->di_atime.tv_nsec));
ip->i_mtime.tv_sec = le32_to_cpu(dip->di_mtime.tv_sec); inode_set_mtime(ip, le32_to_cpu(dip->di_mtime.tv_sec),
ip->i_mtime.tv_nsec = le32_to_cpu(dip->di_mtime.tv_nsec); le32_to_cpu(dip->di_mtime.tv_nsec));
inode_set_ctime(ip, le32_to_cpu(dip->di_ctime.tv_sec), inode_set_ctime(ip, le32_to_cpu(dip->di_ctime.tv_sec),
le32_to_cpu(dip->di_ctime.tv_nsec)); le32_to_cpu(dip->di_ctime.tv_nsec));
ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks)); ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks));
@ -3138,12 +3138,12 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
else /* Leave the original permissions alone */ else /* Leave the original permissions alone */
dip->di_mode = cpu_to_le32(jfs_ip->mode2); dip->di_mode = cpu_to_le32(jfs_ip->mode2);
dip->di_atime.tv_sec = cpu_to_le32(ip->i_atime.tv_sec); dip->di_atime.tv_sec = cpu_to_le32(inode_get_atime_sec(ip));
dip->di_atime.tv_nsec = cpu_to_le32(ip->i_atime.tv_nsec); dip->di_atime.tv_nsec = cpu_to_le32(inode_get_atime_nsec(ip));
dip->di_ctime.tv_sec = cpu_to_le32(inode_get_ctime(ip).tv_sec); dip->di_ctime.tv_sec = cpu_to_le32(inode_get_ctime_sec(ip));
dip->di_ctime.tv_nsec = cpu_to_le32(inode_get_ctime(ip).tv_nsec); dip->di_ctime.tv_nsec = cpu_to_le32(inode_get_ctime_nsec(ip));
dip->di_mtime.tv_sec = cpu_to_le32(ip->i_mtime.tv_sec); dip->di_mtime.tv_sec = cpu_to_le32(inode_get_mtime_sec(ip));
dip->di_mtime.tv_nsec = cpu_to_le32(ip->i_mtime.tv_nsec); dip->di_mtime.tv_nsec = cpu_to_le32(inode_get_mtime_nsec(ip));
dip->di_ixpxd = jfs_ip->ixpxd; /* in-memory pxd's are little-endian */ dip->di_ixpxd = jfs_ip->ixpxd; /* in-memory pxd's are little-endian */
dip->di_acl = jfs_ip->acl; /* as are dxd's */ dip->di_acl = jfs_ip->acl; /* as are dxd's */
dip->di_ea = jfs_ip->ea; dip->di_ea = jfs_ip->ea;

4
fs/jfs/jfs_inode.c
View File

@ -97,8 +97,8 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
jfs_inode->mode2 |= inode->i_mode; jfs_inode->mode2 |= inode->i_mode;
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); simple_inode_init_ts(inode);
jfs_inode->otime = inode_get_ctime(inode).tv_sec; jfs_inode->otime = inode_get_ctime_sec(inode);
inode->i_generation = JFS_SBI(sb)->gengen++; inode->i_generation = JFS_SBI(sb)->gengen++;
jfs_inode->cflag = 0; jfs_inode->cflag = 0;

20
fs/jfs/namei.c
View File

@ -149,7 +149,7 @@ static int jfs_create(struct mnt_idmap *idmap, struct inode *dip,
mark_inode_dirty(ip); mark_inode_dirty(ip);
dip->i_mtime = inode_set_ctime_current(dip); inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
mark_inode_dirty(dip); mark_inode_dirty(dip);
@ -284,7 +284,7 @@ static int jfs_mkdir(struct mnt_idmap *idmap, struct inode *dip,
/* update parent directory inode */ /* update parent directory inode */
inc_nlink(dip); /* for '..' from child directory */ inc_nlink(dip); /* for '..' from child directory */
dip->i_mtime = inode_set_ctime_current(dip); inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
mark_inode_dirty(dip); mark_inode_dirty(dip);
rc = txCommit(tid, 2, &iplist[0], 0); rc = txCommit(tid, 2, &iplist[0], 0);
@ -390,7 +390,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
/* update parent directory's link count corresponding /* update parent directory's link count corresponding
* to ".." entry of the target directory deleted * to ".." entry of the target directory deleted
*/ */
dip->i_mtime = inode_set_ctime_current(dip); inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
inode_dec_link_count(dip); inode_dec_link_count(dip);
/* /*
@ -512,7 +512,8 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
ASSERT(ip->i_nlink); ASSERT(ip->i_nlink);
dip->i_mtime = inode_set_ctime_to_ts(dip, inode_set_ctime_current(ip)); inode_set_mtime_to_ts(dip,
inode_set_ctime_to_ts(dip, inode_set_ctime_current(ip)));
mark_inode_dirty(dip); mark_inode_dirty(dip);
/* update target's inode */ /* update target's inode */
@ -828,7 +829,7 @@ static int jfs_link(struct dentry *old_dentry,
/* update object inode */ /* update object inode */
inc_nlink(ip); /* for new link */ inc_nlink(ip); /* for new link */
inode_set_ctime_current(ip); inode_set_ctime_current(ip);
dir->i_mtime = inode_set_ctime_current(dir); inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
mark_inode_dirty(dir); mark_inode_dirty(dir);
ihold(ip); ihold(ip);
@ -1028,7 +1029,7 @@ static int jfs_symlink(struct mnt_idmap *idmap, struct inode *dip,
mark_inode_dirty(ip); mark_inode_dirty(ip);
dip->i_mtime = inode_set_ctime_current(dip); inode_set_mtime_to_ts(dip, inode_set_ctime_current(dip));
mark_inode_dirty(dip); mark_inode_dirty(dip);
/* /*
* commit update of parent directory and link object * commit update of parent directory and link object
@ -1271,7 +1272,7 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
inode_set_ctime_current(old_ip); inode_set_ctime_current(old_ip);
mark_inode_dirty(old_ip); mark_inode_dirty(old_ip);
new_dir->i_mtime = inode_set_ctime_current(new_dir); inode_set_mtime_to_ts(new_dir, inode_set_ctime_current(new_dir));
mark_inode_dirty(new_dir); mark_inode_dirty(new_dir);
/* Build list of inodes modified by this transaction */ /* Build list of inodes modified by this transaction */
@ -1283,7 +1284,8 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
if (old_dir != new_dir) { if (old_dir != new_dir) {
iplist[ipcount++] = new_dir; iplist[ipcount++] = new_dir;
old_dir->i_mtime = inode_set_ctime_current(old_dir); inode_set_mtime_to_ts(old_dir,
inode_set_ctime_current(old_dir));
mark_inode_dirty(old_dir); mark_inode_dirty(old_dir);
} }
@ -1416,7 +1418,7 @@ static int jfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
mark_inode_dirty(ip); mark_inode_dirty(ip);
dir->i_mtime = inode_set_ctime_current(dir); inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
mark_inode_dirty(dir); mark_inode_dirty(dir);

2
fs/jfs/super.c
View File

@ -818,7 +818,7 @@ out:
} }
if (inode->i_size < off+len-towrite) if (inode->i_size < off+len-towrite)
i_size_write(inode, off+len-towrite); i_size_write(inode, off+len-towrite);
inode->i_mtime = inode_set_ctime_current(inode); inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
mark_inode_dirty(inode); mark_inode_dirty(inode);
inode_unlock(inode); inode_unlock(inode);
return len - towrite; return len - towrite;