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

Commit dafac77e authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps 



commit 02027d42c3f747945f19111d3da2092ed2148ac8 upstream.

This is for backport only.

fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 04030d21

fs/f2fs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, 
	f2fs_dentry_kunmap(dir, page);

	set_page_dirty(page);



	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

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

	f2fs_mark_inode_dirty_sync(dir);

	f2fs_put_page(page, 1);

}
@@ -465,7 +465,7 @@ void update_parent_metadata(struct inode *dir, struct inode *inode, 
			f2fs_i_links_write(dir, true);

		clear_inode_flag(inode, FI_NEW_INODE);

	}

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

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

	f2fs_mark_inode_dirty_sync(dir);



	if (F2FS_I(dir)->i_current_depth != current_depth)
@@ -683,7 +683,7 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode) 


	if (S_ISDIR(inode->i_mode))

		f2fs_i_links_write(dir, false);

	inode->i_ctime = CURRENT_TIME;

	inode->i_ctime = current_time(inode);



	f2fs_i_links_write(inode, false);

	if (S_ISDIR(inode->i_mode)) {
@@ -730,7 +730,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	kunmap(page); /* kunmap - pair of f2fs_find_entry */

	set_page_dirty(page);



	dir->i_ctime = dir->i_mtime = CURRENT_TIME;

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

	f2fs_mark_inode_dirty_sync(dir);



	if (inode)

fs/f2fs/f2fs.h

+22 −0
Original line number Diff line number Diff line
@@ -138,6 +138,28 @@ static inline void inode_nohighmem(struct inode *inode) 
	mapping_set_gfp_mask(inode->i_mapping, GFP_USER);

}



/**

 * current_time - Return FS time

 * @inode: inode.

 *

 * Return the current time truncated to the time granularity supported by

 * the fs.

 *

 * Note that inode and inode->sb cannot be NULL.

 * Otherwise, the function warns and returns time without truncation.

 */

static inline struct timespec current_time(struct inode *inode)

{

	struct timespec now = current_kernel_time();



	if (unlikely(!inode->i_sb)) {

		WARN(1, "current_time() called with uninitialized super_block in the inode");

		return now; 

	}    



	return timespec_trunc(now, inode->i_sb->s_time_gran);

}



/*

 * For checkpoint manager

 */

fs/f2fs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ int f2fs_truncate(struct inode *inode) 
	if (err)

		return err;



	inode->i_mtime = inode->i_ctime = CURRENT_TIME;

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

	f2fs_mark_inode_dirty_sync(inode);

	return 0;

}
@@ -708,7 +708,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) 
				if (err)

					return err;

			}

			inode->i_mtime = inode->i_ctime = CURRENT_TIME;

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

		}

	}
@@ -1402,7 +1402,7 @@ static long f2fs_fallocate(struct file *file, int mode, 
	}



	if (!ret) {

		inode->i_mtime = inode->i_ctime = CURRENT_TIME;

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

		f2fs_mark_inode_dirty_sync(inode);

		f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	}
@@ -1494,7 +1494,7 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg) 
	fi->i_flags = flags;

	inode_unlock(inode);



	inode->i_ctime = CURRENT_TIME;

	inode->i_ctime = current_time(inode);

	f2fs_set_inode_flags(inode);

out:

	mnt_drop_write_file(filp);

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	set_page_dirty(page);

	f2fs_put_page(page, 1);



	dir->i_ctime = dir->i_mtime = CURRENT_TIME;

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

	f2fs_mark_inode_dirty_sync(dir);



	if (inode)

fs/f2fs/namei.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode) 


	inode->i_ino = ino;

	inode->i_blocks = 0;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

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

	inode->i_generation = sbi->s_next_generation++;



	err = insert_inode_locked(inode);
@@ -182,7 +182,7 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, 


	f2fs_balance_fs(sbi, true);



	inode->i_ctime = CURRENT_TIME;

	inode->i_ctime = current_time(inode);

	ihold(inode);



	set_inode_flag(inode, FI_INC_LINK);
@@ -720,7 +720,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 


		f2fs_set_link(new_dir, new_entry, new_page, old_inode);



		new_inode->i_ctime = CURRENT_TIME;

		new_inode->i_ctime = current_time(new_inode);

		down_write(&F2FS_I(new_inode)->i_sem);

		if (old_dir_entry)

			f2fs_i_links_write(new_inode, false);
@@ -774,7 +774,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		file_set_enc_name(old_inode);

	up_write(&F2FS_I(old_inode)->i_sem);



	old_inode->i_ctime = CURRENT_TIME;

	old_inode->i_ctime = current_time(old_inode);

	f2fs_mark_inode_dirty_sync(old_inode);



	f2fs_delete_entry(old_entry, old_page, old_dir, NULL);