Merge tag 'ubifs-for-linus-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / fs / ubifs / dir.c

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 5dc1ac4d826def7c2f8de2c7c395a5e3cb9b657f..3b13c648d4900efeca9f17f118f2dbd0c5e1e8be 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -96,7 +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_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_mapping->nrpages = 0;
 
        if (!is_xattr) {
@@ -324,7 +324,8 @@ 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 = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;
@@ -769,7 +770,8 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
        inode_set_ctime_current(inode);
        dir->i_size += sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;
@@ -843,7 +845,8 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
        drop_nlink(inode);
        dir->i_size -= sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;
@@ -946,7 +949,8 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
        drop_nlink(dir);
        dir->i_size -= sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;
@@ -1020,7 +1024,8 @@ 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 = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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);
@@ -1111,7 +1116,8 @@ 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 = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;
@@ -1211,7 +1217,8 @@ 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 = inode_set_ctime_to_ts(dir, inode_get_ctime(inode));
+       inode_set_mtime_to_ts(dir,
+                             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;