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

Commit 108d0cc3 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

f2fs: clean up redundant change 



This reverts commit ebfffb99.

Better fix was merged already:

0f4d87ae f2fs: fix sbi->extent_list corruption issue

Change-Id: I7489f993d5556bcf6e71fc27acfd8399bce846cb
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 070370f0

fs/f2fs/f2fs.h

+0 −1
Original line number Diff line number Diff line
@@ -3440,7 +3440,6 @@ struct rb_entry *f2fs_lookup_rb_tree_ret(struct rb_root_cached *root, 
bool f2fs_check_rb_tree_consistence(struct f2fs_sb_info *sbi,

						struct rb_root_cached *root);

unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink);

unsigned long __count_extent_cache(struct f2fs_sb_info *sbi);

bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext);

void f2fs_drop_extent_tree(struct inode *inode);

unsigned int f2fs_destroy_extent_node(struct inode *inode);

fs/f2fs/shrinker.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static unsigned long __count_free_nids(struct f2fs_sb_info *sbi) 
	return count > 0 ? count : 0;

}



unsigned long __count_extent_cache(struct f2fs_sb_info *sbi)

static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi)

{

	return atomic_read(&sbi->total_zombie_tree) +

				atomic_read(&sbi->total_ext_node);

fs/f2fs/super.c

+1 −12
Original line number Diff line number Diff line
@@ -3038,16 +3038,6 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) 
	sbi->readdir_ra = 1;

}



static void f2fs_cleanup_inodes(struct f2fs_sb_info *sbi)

{

	struct super_block *sb = sbi->sb;



	sync_filesystem(sb);

	shrink_dcache_sb(sb);

	evict_inodes(sb);

	f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));

}



static int f2fs_fill_super(struct super_block *sb, void *data, int silent)

{

	struct f2fs_sb_info *sbi;
@@ -3433,8 +3423,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	 * falls into an infinite loop in f2fs_sync_meta_pages().

	 */

	truncate_inode_pages_final(META_MAPPING(sbi));

	/* cleanup recovery and quota inodes */

	f2fs_cleanup_inodes(sbi);

	f2fs_unregister_sysfs(sbi);

free_root_inode:

	dput(sb->s_root);
@@ -3480,6 +3468,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	/* give only one another chance */

	if (retry) {

		retry = false;

		shrink_dcache_sb(sb);

		goto try_onemore;

	}

	return err;