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

udf: convert to new timestamp accessors 



Convert to using the new inode timestamp accessor functions.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-72-jlayton@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent e4cfef33

fs/udf/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ struct inode *udf_new_inode(struct inode *dir, umode_t mode) 
		iinfo->i_alloc_type = ICBTAG_FLAG_AD_SHORT;

	else

		iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;

	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);

	iinfo->i_crtime = inode->i_mtime;

	simple_inode_init_ts(inode);

	iinfo->i_crtime = inode_get_mtime(inode);

	if (unlikely(insert_inode_locked(inode) < 0)) {

		make_bad_inode(inode);

		iput(inode);

fs/udf/inode.c

+22 −16
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ int udf_setsize(struct inode *inode, loff_t newsize) 
			goto out_unlock;

	}

update_time:

	inode->i_mtime = inode_set_ctime_current(inode);

	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	if (IS_SYNC(inode))

		udf_sync_inode(inode);

	else
@@ -1327,7 +1327,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
	int bs = inode->i_sb->s_blocksize;

	int ret = -EIO;

	uint32_t uid, gid;

	struct timespec64 ctime;

	struct timespec64 ts;



reread:

	if (iloc->partitionReferenceNum >= sbi->s_partitions) {
@@ -1504,10 +1504,12 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		inode->i_blocks = le64_to_cpu(fe->logicalBlocksRecorded) <<

			(inode->i_sb->s_blocksize_bits - 9);



		udf_disk_stamp_to_time(&inode->i_atime, fe->accessTime);

		udf_disk_stamp_to_time(&inode->i_mtime, fe->modificationTime);

		udf_disk_stamp_to_time(&ctime, fe->attrTime);

		inode_set_ctime_to_ts(inode, ctime);

		udf_disk_stamp_to_time(&ts, fe->accessTime);

		inode_set_atime_to_ts(inode, ts);

		udf_disk_stamp_to_time(&ts, fe->modificationTime);

		inode_set_mtime_to_ts(inode, ts);

		udf_disk_stamp_to_time(&ts, fe->attrTime);

		inode_set_ctime_to_ts(inode, ts);



		iinfo->i_unique = le64_to_cpu(fe->uniqueID);

		iinfo->i_lenEAttr = le32_to_cpu(fe->lengthExtendedAttr);
@@ -1519,11 +1521,13 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		inode->i_blocks = le64_to_cpu(efe->logicalBlocksRecorded) <<

		    (inode->i_sb->s_blocksize_bits - 9);



		udf_disk_stamp_to_time(&inode->i_atime, efe->accessTime);

		udf_disk_stamp_to_time(&inode->i_mtime, efe->modificationTime);

		udf_disk_stamp_to_time(&ts, efe->accessTime);

		inode_set_atime_to_ts(inode, ts);

		udf_disk_stamp_to_time(&ts, efe->modificationTime);

		inode_set_mtime_to_ts(inode, ts);

		udf_disk_stamp_to_time(&ts, efe->attrTime);

		inode_set_ctime_to_ts(inode, ts);

		udf_disk_stamp_to_time(&iinfo->i_crtime, efe->createTime);

		udf_disk_stamp_to_time(&ctime, efe->attrTime);

		inode_set_ctime_to_ts(inode, ctime);



		iinfo->i_unique = le64_to_cpu(efe->uniqueID);

		iinfo->i_lenEAttr = le32_to_cpu(efe->lengthExtendedAttr);
@@ -1798,8 +1802,8 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
		       inode->i_sb->s_blocksize - sizeof(struct fileEntry));

		fe->logicalBlocksRecorded = cpu_to_le64(lb_recorded);



		udf_time_to_disk_stamp(&fe->accessTime, inode->i_atime);

		udf_time_to_disk_stamp(&fe->modificationTime, inode->i_mtime);

		udf_time_to_disk_stamp(&fe->accessTime, inode_get_atime(inode));

		udf_time_to_disk_stamp(&fe->modificationTime, inode_get_mtime(inode));

		udf_time_to_disk_stamp(&fe->attrTime, inode_get_ctime(inode));

		memset(&(fe->impIdent), 0, sizeof(struct regid));

		strcpy(fe->impIdent.ident, UDF_ID_DEVELOPER);
@@ -1829,12 +1833,14 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
				cpu_to_le32(inode->i_sb->s_blocksize);

		}



		udf_adjust_time(iinfo, inode->i_atime);

		udf_adjust_time(iinfo, inode->i_mtime);

		udf_adjust_time(iinfo, inode_get_atime(inode));

		udf_adjust_time(iinfo, inode_get_mtime(inode));

		udf_adjust_time(iinfo, inode_get_ctime(inode));



		udf_time_to_disk_stamp(&efe->accessTime, inode->i_atime);

		udf_time_to_disk_stamp(&efe->modificationTime, inode->i_mtime);

		udf_time_to_disk_stamp(&efe->accessTime,

				       inode_get_atime(inode));

		udf_time_to_disk_stamp(&efe->modificationTime,

				       inode_get_mtime(inode));

		udf_time_to_disk_stamp(&efe->createTime, iinfo->i_crtime);

		udf_time_to_disk_stamp(&efe->attrTime, inode_get_ctime(inode));

fs/udf/namei.c

+8 −8
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode) 
	*(__le32 *)((struct allocDescImpUse *)iter.fi.icb.impUse)->impUse =

		cpu_to_le32(iinfo->i_unique & 0x00000000FFFFFFFFUL);

	udf_fiiter_write_fi(&iter, NULL);

	dir->i_mtime = inode_set_ctime_current(dir);

	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));

	mark_inode_dirty(dir);

	udf_fiiter_release(&iter);

	udf_add_fid_counter(dir->i_sb, false, 1);
@@ -471,7 +471,7 @@ static int udf_mkdir(struct mnt_idmap *idmap, struct inode *dir, 
	udf_fiiter_release(&iter);

	udf_add_fid_counter(dir->i_sb, true, 1);

	inc_nlink(dir);

	dir->i_mtime = inode_set_ctime_current(dir);

	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));

	mark_inode_dirty(dir);

	d_instantiate_new(dentry, inode);
@@ -523,8 +523,8 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) 
	inode->i_size = 0;

	inode_dec_link_count(dir);

	udf_add_fid_counter(dir->i_sb, true, -1);

	dir->i_mtime = inode_set_ctime_to_ts(dir,

					     inode_set_ctime_current(inode));

	inode_set_mtime_to_ts(dir,

			      inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode)));

	mark_inode_dirty(dir);

	ret = 0;

end_rmdir:
@@ -555,7 +555,7 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry) 
		set_nlink(inode, 1);

	}

	udf_fiiter_delete_entry(&iter);

	dir->i_mtime = inode_set_ctime_current(dir);

	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));

	mark_inode_dirty(dir);

	inode_dec_link_count(inode);

	udf_add_fid_counter(dir->i_sb, false, -1);
@@ -748,7 +748,7 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir, 
	udf_add_fid_counter(dir->i_sb, false, 1);

	inode_set_ctime_current(inode);

	mark_inode_dirty(inode);

	dir->i_mtime = inode_set_ctime_current(dir);

	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));

	mark_inode_dirty(dir);

	ihold(inode);

	d_instantiate(dentry, inode);
@@ -866,8 +866,8 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, 
		udf_add_fid_counter(old_dir->i_sb, S_ISDIR(new_inode->i_mode),

				    -1);

	}

	old_dir->i_mtime = inode_set_ctime_current(old_dir);

	new_dir->i_mtime = inode_set_ctime_current(new_dir);

	inode_set_mtime_to_ts(old_dir, inode_set_ctime_current(old_dir));

	inode_set_mtime_to_ts(new_dir, inode_set_ctime_current(new_dir));

	mark_inode_dirty(old_dir);

	mark_inode_dirty(new_dir);