]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bfs: convert to new timestamp accessors
authorJeff Layton <jlayton@kernel.org>
Wed, 4 Oct 2023 18:52:07 +0000 (14:52 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 18 Oct 2023 11:26:19 +0000 (13:26 +0200)
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-20-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/bfs/dir.c
fs/bfs/inode.c

index 12b8af04dcb38400f6cdd8fdfcfebc0e28ad5d56..fbc4ae80a4b22ebeca21e407d44aed1267f8d593 100644 (file)
@@ -97,7 +97,7 @@ static int bfs_create(struct mnt_idmap *idmap, struct inode *dir,
        set_bit(ino, info->si_imap);
        info->si_freei--;
        inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
-       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_blocks = 0;
        inode->i_op = &bfs_file_inops;
        inode->i_fop = &bfs_file_operations;
@@ -187,7 +187,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry)
        }
        de->ino = 0;
        mark_buffer_dirty_inode(bh, dir);
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
        inode_dec_link_count(inode);
@@ -240,7 +240,7 @@ static int bfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
                        goto end_rename;
        }
        old_de->ino = 0;
-       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);
        if (new_inode) {
                inode_set_ctime_current(new_inode);
@@ -294,7 +294,8 @@ static int bfs_add_entry(struct inode *dir, const struct qstr *child, int ino)
                                        dir->i_size += BFS_DIRENT_SIZE;
                                        inode_set_ctime_current(dir);
                                }
-                               dir->i_mtime = inode_set_ctime_current(dir);
+                               inode_set_mtime_to_ts(dir,
+                                                     inode_set_ctime_current(dir));
                                mark_inode_dirty(dir);
                                de->ino = cpu_to_le16((u16)ino);
                                for (i = 0; i < BFS_NAMELEN; i++)
index e6a76ae9eb44427d96e389f8493641b8a151ca2f..355957dbce39f2a0ac5102c555615bee8ed5c441 100644 (file)
@@ -80,11 +80,9 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
        set_nlink(inode, le32_to_cpu(di->i_nlink));
        inode->i_size = BFS_FILESIZE(di);
        inode->i_blocks = BFS_FILEBLOCKS(di);
-       inode->i_atime.tv_sec =  le32_to_cpu(di->i_atime);
-       inode->i_mtime.tv_sec =  le32_to_cpu(di->i_mtime);
+       inode_set_atime(inode, le32_to_cpu(di->i_atime), 0);
+       inode_set_mtime(inode, le32_to_cpu(di->i_mtime), 0);
        inode_set_ctime(inode, le32_to_cpu(di->i_ctime), 0);
-       inode->i_atime.tv_nsec = 0;
-       inode->i_mtime.tv_nsec = 0;
 
        brelse(bh);
        unlock_new_inode(inode);
@@ -140,9 +138,9 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
        di->i_uid = cpu_to_le32(i_uid_read(inode));
        di->i_gid = cpu_to_le32(i_gid_read(inode));
        di->i_nlink = cpu_to_le32(inode->i_nlink);
-       di->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-       di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
-       di->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec);
+       di->i_atime = cpu_to_le32(inode_get_atime_sec(inode));
+       di->i_mtime = cpu_to_le32(inode_get_mtime_sec(inode));
+       di->i_ctime = cpu_to_le32(inode_get_ctime_sec(inode));
        i_sblock = BFS_I(inode)->i_sblock;
        di->i_sblock = cpu_to_le32(i_sblock);
        di->i_eblock = cpu_to_le32(BFS_I(inode)->i_eblock);