Commit d07d3a7e authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Message-Id: <20230705190309.579783-76-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent bb9c40e6

fs/ubifs/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/ubifs/dir.c

+11 −13
Original line number Diff line number Diff line
@@ -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;

fs/ubifs/file.c

+9 −7
Original line number Diff line number Diff line
@@ -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 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
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);

fs/ubifs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/ubifs/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -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));