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

Commit 71347a7a authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "f2fs: avoid f2fs_bug_on if f2fs_get_meta_page_nofail got EIO" 



This reverts commit 9603f152.

This is a preparation change for merging android-4.14 commit
d4e5dea0 into msm-4.14 branch.
The reverted change is committed already as:

728b4ac0 f2fs: avoid f2fs_bug_on if f2fs_get_meta_page_nofail got EIO

Change-Id: Id177130ad42de1658370bd962c02c45431522afb
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent eeb08dc9

fs/f2fs/checkpoint.c

+5 −5
Original line number Diff line number Diff line
@@ -119,8 +119,11 @@ struct page *f2fs_get_meta_page_nofail(struct f2fs_sb_info *sbi, pgoff_t index) 
		if (PTR_ERR(page) == -EIO &&

				++count <= DEFAULT_RETRY_IO_COUNT)

			goto retry;



		f2fs_stop_checkpoint(sbi, false);

		f2fs_bug_on(sbi, 1);

	}



	return page;

}
@@ -1558,10 +1561,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	ckpt->checkpoint_ver = cpu_to_le64(++ckpt_ver);



	/* write cached NAT/SIT entries to NAT/SIT area */

	err = f2fs_flush_nat_entries(sbi, cpc);

	if (err)

		goto stop;



	f2fs_flush_nat_entries(sbi, cpc);

	f2fs_flush_sit_entries(sbi, cpc);



	/* unlock all the fs_lock[] in do_checkpoint() */
@@ -1570,7 +1570,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
		f2fs_release_discard_addrs(sbi);

	else

		f2fs_clear_prefree_segments(sbi, cpc);

stop:



	unblock_operations(sbi);

	stat_inc_cp_count(sbi->stat_info);

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2951,7 +2951,7 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page); 
int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);

int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,

			unsigned int segno, struct f2fs_summary_block *sum);

int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);

void f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);

int f2fs_build_node_manager(struct f2fs_sb_info *sbi);

void f2fs_destroy_node_manager(struct f2fs_sb_info *sbi);

int __init f2fs_create_node_manager_caches(void);

fs/f2fs/gc.c

+0 −12
Original line number Diff line number Diff line
@@ -1078,18 +1078,6 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, 
	/* reference all summary page */

	while (segno < end_segno) {

		sum_page = f2fs_get_sum_page(sbi, segno++);

		if (IS_ERR(sum_page)) {

			int err = PTR_ERR(sum_page);



			end_segno = segno - 1;

			for (segno = start_segno; segno < end_segno; segno++) {

				sum_page = find_get_page(META_MAPPING(sbi),

						GET_SUM_BLOCK(sbi, segno));

				f2fs_put_page(sum_page, 0);

				f2fs_put_page(sum_page, 0);

			}

			return err;

		}

		unlock_page(sum_page);

	}

fs/f2fs/node.c

+8 −24
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid) 


	/* get current nat block page with lock */

	src_page = get_current_nat_page(sbi, nid);

	if (IS_ERR(src_page))

		return src_page;

	dst_page = f2fs_grab_meta_page(sbi, dst_off);

	f2fs_bug_on(sbi, PageDirty(src_page));
@@ -2268,19 +2266,15 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi, 
						nm_i->nat_block_bitmap)) {

			struct page *page = get_current_nat_page(sbi, nid);



			if (IS_ERR(page)) {

				ret = PTR_ERR(page);

			} else {

			ret = scan_nat_page(sbi, page, nid);

			f2fs_put_page(page, 1);

			}



			if (ret) {

				up_read(&nm_i->nat_tree_lock);

				f2fs_bug_on(sbi, !mount);

				f2fs_msg(sbi->sb, KERN_ERR,

					"NAT is corrupt, run fsck to fix it");

				return ret;

				return -EINVAL;

			}

		}
@@ -2715,7 +2709,7 @@ static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid, 
		__clear_bit_le(nat_index, nm_i->full_nat_bits);

}



static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,

static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,

		struct nat_entry_set *set, struct cp_control *cpc)

{

	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
@@ -2739,9 +2733,6 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi, 
		down_write(&curseg->journal_rwsem);

	} else {

		page = get_next_nat_page(sbi, start_nid);

		if (IS_ERR(page))

			return PTR_ERR(page);



		nat_blk = page_address(page);

		f2fs_bug_on(sbi, !nat_blk);

	}
@@ -2787,13 +2778,12 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi, 
		radix_tree_delete(&NM_I(sbi)->nat_set_root, set->set);

		kmem_cache_free(nat_entry_set_slab, set);

	}

	return 0;

}



/*

 * This function is called during the checkpointing process.

 */

int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)

void f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
@@ -2803,7 +2793,6 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	unsigned int found;

	nid_t set_idx = 0;

	LIST_HEAD(sets);

	int err = 0;



	/* during unmount, let's flush nat_bits before checking dirty_nat_cnt */

	if (enabled_nat_bits(sbi, cpc)) {
@@ -2813,7 +2802,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	}



	if (!nm_i->dirty_nat_cnt)

		return 0;

		return;



	down_write(&nm_i->nat_tree_lock);
@@ -2836,16 +2825,11 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	}



	/* flush dirty nats in nat entry set */

	list_for_each_entry_safe(set, tmp, &sets, set_list) {

		err = __flush_nat_entry_set(sbi, set, cpc);

		if (err)

			break;

	}

	list_for_each_entry_safe(set, tmp, &sets, set_list)

		__flush_nat_entry_set(sbi, set, cpc);



	up_write(&nm_i->nat_tree_lock);

	/* Allow dirty nats by node block allocation in write_begin */



	return err;

}



static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)

fs/f2fs/recovery.c

+0 −2
Original line number Diff line number Diff line
@@ -422,8 +422,6 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, 
	}



	sum_page = f2fs_get_sum_page(sbi, segno);

	if (IS_ERR(sum_page))

		return PTR_ERR(sum_page);

	sum_node = (struct f2fs_summary_block *)page_address(sum_page);

	sum = sum_node->entries[blkoff];

	f2fs_put_page(sum_page, 1);