Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeca7ea1 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Theodore Ts'o
Browse files

ext4: use current_time() for inode timestamps 



CURRENT_TIME_SEC and CURRENT_TIME are not y2038 safe.
current_time() will be transitioned to be y2038 safe
along with vfs.

current_time() returns timestamps according to the
granularities set in the super_block.
The granularity check in ext4_current_time() to call
current_time() or CURRENT_TIME_SEC is not required.
Use current_time() directly to obtain timestamps
unconditionally, and remove ext4_current_time().

Quota files are assumed to be on the same filesystem.
Hence, use current_time() for these files as well.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 30a9d7af

fs/ext4/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, 
			error = posix_acl_update_mode(inode, &inode->i_mode, &acl);

			if (error)

				return error;

			inode->i_ctime = ext4_current_time(inode);

			inode->i_ctime = current_time(inode);

			ext4_mark_inode_dirty(handle, inode);

		}

		break;

fs/ext4/ext4.h

+0 −6
Original line number Diff line number Diff line
@@ -1532,12 +1532,6 @@ static inline struct ext4_inode_info *EXT4_I(struct inode *inode) 
	return container_of(inode, struct ext4_inode_info, vfs_inode);

}



static inline struct timespec ext4_current_time(struct inode *inode)

{

	return (inode->i_sb->s_time_gran < NSEC_PER_SEC) ?

		current_fs_time(inode->i_sb) : CURRENT_TIME_SEC;

}



static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)

{

	return ino == EXT4_ROOT_INO ||

fs/ext4/extents.c

+5 −5
Original line number Diff line number Diff line
@@ -4724,7 +4724,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, 
		map.m_lblk += ret;

		map.m_len = len = len - ret;

		epos = (loff_t)map.m_lblk << inode->i_blkbits;

		inode->i_ctime = ext4_current_time(inode);

		inode->i_ctime = current_time(inode);

		if (new_size) {

			if (epos > new_size)

				epos = new_size;
@@ -4852,7 +4852,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		}

		/* Now release the pages and zero block aligned part of pages */

		truncate_pagecache_range(inode, start, end - 1);

		inode->i_mtime = inode->i_ctime = ext4_current_time(inode);

		inode->i_mtime = inode->i_ctime = current_time(inode);



		ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,

					     flags, mode);
@@ -4877,7 +4877,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		goto out_dio;

	}



	inode->i_mtime = inode->i_ctime = ext4_current_time(inode);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	if (new_size) {

		ext4_update_inode_size(inode, new_size);

	} else {
@@ -5567,7 +5567,7 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);

	inode->i_mtime = inode->i_ctime = ext4_current_time(inode);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	ext4_mark_inode_dirty(handle, inode);



out_stop:
@@ -5677,7 +5677,7 @@ int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	/* Expand file to avoid data loss if there is error while shifting */

	inode->i_size += len;

	EXT4_I(inode)->i_disksize += len;

	inode->i_mtime = inode->i_ctime = ext4_current_time(inode);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	ret = ext4_mark_inode_dirty(handle, inode);

	if (ret)

		goto out_stop;

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, 
	/* This is the optimal IO size (for stat), not the fs block size */

	inode->i_blocks = 0;

	inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =

						       ext4_current_time(inode);

						       current_time(inode);



	memset(ei->i_data, 0, sizeof(ei->i_data));

	ei->i_dir_start_lookup = 0;

fs/ext4/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, 
	 * happen is that the times are slightly out of date

	 * and/or different from the directory change time.

	 */

	dir->i_mtime = dir->i_ctime = ext4_current_time(dir);

	dir->i_mtime = dir->i_ctime = current_time(dir);

	ext4_update_dx_flag(dir);

	dir->i_version++;

	ext4_mark_inode_dirty(handle, dir);
@@ -1971,7 +1971,7 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline) 
	if (inode->i_nlink)

		ext4_orphan_del(handle, inode);



	inode->i_mtime = inode->i_ctime = ext4_current_time(inode);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	ext4_mark_inode_dirty(handle, inode);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);