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

Commit bdf16ef1 authored by Sheng Yong's avatar Sheng Yong Committed by Jaegeuk Kim
Browse files

f2fs: move set_file_temperature into f2fs_new_inode 



Since the file name has already passed to f2fs_new_inode(), let's
move set_file_temperature() into f2fs_new_inode().

Signed-off-by: default avatarSheng Yong <shengyong@oppo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 3fda9d56

fs/f2fs/namei.c

+29 −33
Original line number Diff line number Diff line
@@ -176,6 +176,32 @@ static void set_compress_new_inode(struct f2fs_sb_info *sbi, struct inode *dir, 
	}

}



/*

 * Set file's temperature for hot/cold data separation

 */

static void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *inode,

		const unsigned char *name)

{

	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;

	int i, cold_count, hot_count;



	f2fs_down_read(&sbi->sb_lock);

	cold_count = le32_to_cpu(sbi->raw_super->extension_count);

	hot_count = sbi->raw_super->hot_ext_count;

	for (i = 0; i < cold_count + hot_count; i++)

		if (is_extension_exist(name, extlist[i], true))

			break;

	f2fs_up_read(&sbi->sb_lock);



	if (i == cold_count + hot_count)

		return;



	if (i < cold_count)

		file_set_cold(inode);

	else

		file_set_hot(inode);

}



static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode,

						const char *name)

{
@@ -270,6 +296,9 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode, 
	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))

		set_inode_flag(inode, FI_INLINE_DATA);



	if (name && !test_opt(sbi, DISABLE_EXT_IDENTIFY))

		set_file_temperature(sbi, inode, name);



	stat_inc_inline_xattr(inode);

	stat_inc_inline_inode(inode);

	stat_inc_inline_dir(inode);
@@ -298,36 +327,6 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode, 
	return ERR_PTR(err);

}



/*

 * Set file's temperature for hot/cold data separation

 */

static inline void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *inode,

		const unsigned char *name)

{

	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;

	int i, cold_count, hot_count;



	f2fs_down_read(&sbi->sb_lock);



	cold_count = le32_to_cpu(sbi->raw_super->extension_count);

	hot_count = sbi->raw_super->hot_ext_count;



	for (i = 0; i < cold_count + hot_count; i++) {

		if (is_extension_exist(name, extlist[i], true))

			break;

	}



	f2fs_up_read(&sbi->sb_lock);



	if (i == cold_count + hot_count)

		return;



	if (i < cold_count)

		file_set_cold(inode);

	else

		file_set_hot(inode);

}



static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,

						bool excl)

{
@@ -349,9 +348,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	if (IS_ERR(inode))

		return PTR_ERR(inode);



	if (!test_opt(sbi, DISABLE_EXT_IDENTIFY))

		set_file_temperature(sbi, inode, dentry->d_name.name);



	inode->i_op = &f2fs_file_inode_operations;

	inode->i_fop = &f2fs_file_operations;

	inode->i_mapping->a_ops = &f2fs_dblock_aops;