ubifs: convert to ctime accessor functions

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: Zhihao Cheng <chengzhihao1@huawei.com>
Message-Id: <20230705190309.579783-76-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 9c9d3f0e36a4f9b6b871f1e7488aebca74de663e..eef9e527d9ff94a181cd1bed1e2d044112de6bb6 100644 (file)
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -243,8 +243,8 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode)
               (unsigned int)inode->i_mtime.tv_sec,
               (unsigned int)inode->i_mtime.tv_nsec);
        pr_err("\tctime          %u.%u\n",
-              (unsigned int)inode->i_ctime.tv_sec,
-              (unsigned int)inode->i_ctime.tv_nsec);
+              (unsigned int) inode_get_ctime(inode).tv_sec,
+              (unsigned int) inode_get_ctime(inode).tv_nsec);
        pr_err("\tcreat_sqnum    %llu\n", ui->creat_sqnum);
        pr_err("\txattr_size     %u\n", ui->xattr_size);
        pr_err("\txattr_cnt      %u\n", ui->xattr_cnt);

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 7ec25310bd8af8444164374f1476d8517a721f8e..3a1ba8ba308a735740b0aa1a3ced1e5e1ef5d4e8 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -96,8 +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->i_ctime =
-                        current_time(inode);
+       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
        inode->i_mapping->nrpages = 0;
 
        if (!is_xattr) {
@@ -325,7 +324,7 @@ 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 = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -765,10 +764,10 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
 
        inc_nlink(inode);
        ihold(inode);
-       inode->i_ctime = current_time(inode);
+       inode_set_ctime_current(inode);
        dir->i_size += sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -838,11 +837,11 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
        }
 
        lock_2_inodes(dir, inode);
-       inode->i_ctime = current_time(dir);
+       inode_set_ctime_current(inode);
        drop_nlink(inode);
        dir->i_size -= sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -940,12 +939,12 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
        }
 
        lock_2_inodes(dir, inode);
-       inode->i_ctime = current_time(dir);
+       inode_set_ctime_current(inode);
        clear_nlink(inode);
        drop_nlink(dir);
        dir->i_size -= sz_change;
        dir_ui->ui_size = dir->i_size;
-       dir->i_mtime = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -1019,7 +1018,7 @@ 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 = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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);
@@ -1110,7 +1109,7 @@ 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 = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -1210,7 +1209,7 @@ 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 = dir->i_ctime = inode->i_ctime;
+       dir->i_mtime = 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;
@@ -1298,7 +1297,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
        struct ubifs_budget_req ino_req = { .dirtied_ino = 1,
                        .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) };
        struct ubifs_budget_req wht_req;
-       struct timespec64 time;
        unsigned int saved_nlink;
        struct fscrypt_name old_nm, new_nm;
 

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 6738fe43040b11d3c967673b37167722fd8f795c..436b27d7c58f405bf0881deeaaa041ff1fc97142 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1092,7 +1092,7 @@ static void do_attr_changes(struct inode *inode, const struct iattr *attr)
        if (attr->ia_valid & ATTR_MTIME)
                inode->i_mtime = attr->ia_mtime;
        if (attr->ia_valid & ATTR_CTIME)
-               inode->i_ctime = attr->ia_ctime;
+               inode_set_ctime_to_ts(inode, attr->ia_ctime);
        if (attr->ia_valid & ATTR_MODE) {
                umode_t mode = attr->ia_mode;
 
@@ -1192,7 +1192,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,
        mutex_lock(&ui->ui_mutex);
        ui->ui_size = inode->i_size;
        /* Truncation changes inode [mc]time */
-       inode->i_mtime = inode->i_ctime = current_time(inode);
+       inode->i_mtime = inode_set_ctime_current(inode);
        /* Other attributes may be changed at the same time as well */
        do_attr_changes(inode, attr);
        err = ubifs_jnl_truncate(c, inode, old_size, new_size);
@@ -1239,7 +1239,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,
        mutex_lock(&ui->ui_mutex);
        if (attr->ia_valid & ATTR_SIZE) {
                /* Truncation changes inode [mc]time */
-               inode->i_mtime = inode->i_ctime = current_time(inode);
+               inode->i_mtime = inode_set_ctime_current(inode);
                /* 'truncate_setsize()' changed @i_size, update @ui_size */
                ui->ui_size = inode->i_size;
        }
@@ -1364,8 +1364,10 @@ out:
 static inline int mctime_update_needed(const struct inode *inode,
                                       const struct timespec64 *now)
 {
+       struct timespec64 ctime = inode_get_ctime(inode);
+
        if (!timespec64_equal(&inode->i_mtime, now) ||
-           !timespec64_equal(&inode->i_ctime, now))
+           !timespec64_equal(&ctime, now))
                return 1;
        return 0;
 }
@@ -1396,7 +1398,7 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,
        if (flags & S_ATIME)
                inode->i_atime = *time;
        if (flags & S_CTIME)
-               inode->i_ctime = *time;
+               inode_set_ctime_to_ts(inode, *time);
        if (flags & S_MTIME)
                inode->i_mtime = *time;
 
@@ -1432,7 +1434,7 @@ static int update_mctime(struct inode *inode)
                        return err;
 
                mutex_lock(&ui->ui_mutex);
-               inode->i_mtime = inode->i_ctime = current_time(inode);
+               inode->i_mtime = inode_set_ctime_current(inode);
                release = ui->dirty;
                mark_inode_dirty_sync(inode);
                mutex_unlock(&ui->ui_mutex);
@@ -1570,7 +1572,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)
                struct ubifs_inode *ui = ubifs_inode(inode);
 
                mutex_lock(&ui->ui_mutex);
-               inode->i_mtime = inode->i_ctime = current_time(inode);
+               inode->i_mtime = inode_set_ctime_current(inode);
                release = ui->dirty;
                mark_inode_dirty_sync(inode);
                mutex_unlock(&ui->ui_mutex);

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 67c5108abd894f7ba053624766e937e63dedef04..d79cabe193c34765ec1936d8f001f09d3c949733 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -118,7 +118,7 @@ static int setflags(struct inode *inode, int flags)
        ui->flags &= ~ioctl2ubifs(UBIFS_SETTABLE_IOCTL_FLAGS);
        ui->flags |= ioctl2ubifs(flags);
        ubifs_set_inode_flags(inode);
-       inode->i_ctime = current_time(inode);
+       inode_set_ctime_current(inode);
        release = ui->dirty;
        mark_inode_dirty_sync(inode);
        mutex_unlock(&ui->ui_mutex);

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index dc52ac0f4a345f30d43fc69b7642d76014aeadc0..ffc9beee7be650f125a93114562e356a7db1d5af 100644 (file)
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -454,8 +454,8 @@ static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino,
        ino->creat_sqnum = cpu_to_le64(ui->creat_sqnum);
        ino->atime_sec  = cpu_to_le64(inode->i_atime.tv_sec);
        ino->atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
-       ino->ctime_sec  = cpu_to_le64(inode->i_ctime.tv_sec);
-       ino->ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
+       ino->ctime_sec  = cpu_to_le64(inode_get_ctime(inode).tv_sec);
+       ino->ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);
        ino->mtime_sec  = cpu_to_le64(inode->i_mtime.tv_sec);
        ino->mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
        ino->uid   = cpu_to_le32(i_uid_read(inode));

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 32cb147597960ca2aa20aab79a3b14152a304900..b08fb28d16b55be454d3640a04988adc3d42871b 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -146,8 +146,8 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
        inode->i_atime.tv_nsec = le32_to_cpu(ino->atime_nsec);
        inode->i_mtime.tv_sec  = (int64_t)le64_to_cpu(ino->mtime_sec);
        inode->i_mtime.tv_nsec = le32_to_cpu(ino->mtime_nsec);
-       inode->i_ctime.tv_sec  = (int64_t)le64_to_cpu(ino->ctime_sec);
-       inode->i_ctime.tv_nsec = le32_to_cpu(ino->ctime_nsec);
+       inode_set_ctime(inode, (int64_t)le64_to_cpu(ino->ctime_sec),
+                       le32_to_cpu(ino->ctime_nsec));
        inode->i_mode = le32_to_cpu(ino->mode);
        inode->i_size = le64_to_cpu(ino->size);
 

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 349228dd1191fdf5c72cf1d41e0287e36a7277e1..406c82eab51386b6bbcb41c75802f9dff30e1b79 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -134,7 +134,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
        ui->data_len = size;
 
        mutex_lock(&host_ui->ui_mutex);
-       host->i_ctime = current_time(host);
+       inode_set_ctime_current(host);
        host_ui->xattr_cnt += 1;
        host_ui->xattr_size += CALC_DENT_SIZE(fname_len(nm));
        host_ui->xattr_size += CALC_XATTR_BYTES(size);
@@ -215,7 +215,7 @@ static int change_xattr(struct ubifs_info *c, struct inode *host,
        ui->data_len = size;
 
        mutex_lock(&host_ui->ui_mutex);
-       host->i_ctime = current_time(host);
+       inode_set_ctime_current(host);
        host_ui->xattr_size -= CALC_XATTR_BYTES(old_size);
        host_ui->xattr_size += CALC_XATTR_BYTES(size);
 
@@ -474,7 +474,7 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,
                return err;
 
        mutex_lock(&host_ui->ui_mutex);
-       host->i_ctime = current_time(host);
+       inode_set_ctime_current(host);
        host_ui->xattr_cnt -= 1;
        host_ui->xattr_size -= CALC_DENT_SIZE(fname_len(nm));
        host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);