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

Commit ccbf3863 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "f2fs: handle errors of f2fs_get_meta_page_nofail"

parents 742ed2a7 4c7f9d9f

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
	return __get_meta_page(sbi, index, true);

}



struct page *f2fs_get_meta_page_nofail(struct f2fs_sb_info *sbi, pgoff_t index)

struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index)

{

	struct page *page;

	int count = 0;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -3384,7 +3384,7 @@ enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi, 
void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io);

struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page_nofail(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type);

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void clear_node_page_dirty(struct page *page) 


static struct page *get_current_nat_page(struct f2fs_sb_info *sbi, nid_t nid)

{

	return f2fs_get_meta_page_nofail(sbi, current_nat_addr(sbi, nid));

	return f2fs_get_meta_page(sbi, current_nat_addr(sbi, nid));

}



static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid)

fs/f2fs/segment.c

+9 −3
Original line number Diff line number Diff line
@@ -2318,7 +2318,9 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra) 
 */

struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno)

{

	return f2fs_get_meta_page_nofail(sbi, GET_SUM_BLOCK(sbi, segno));

	if (unlikely(f2fs_cp_error(sbi)))

		return ERR_PTR(-EIO);

	return f2fs_get_meta_page_retry(sbi, GET_SUM_BLOCK(sbi, segno));

}



void f2fs_update_meta_page(struct f2fs_sb_info *sbi,
@@ -2590,7 +2592,11 @@ static void change_curseg(struct f2fs_sb_info *sbi, int type) 
	__next_free_blkoff(sbi, curseg, 0);



	sum_page = f2fs_get_sum_page(sbi, new_segno);

	f2fs_bug_on(sbi, IS_ERR(sum_page));

	if (IS_ERR(sum_page)) {

		/* GC won't be able to use stale summary pages by cp_error */

		memset(curseg->sum_blk, 0, SUM_ENTRY_SIZE);

		return;

	}

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

	memcpy(curseg->sum_blk, sum_node, SUM_ENTRY_SIZE);

	f2fs_put_page(sum_page, 1);
@@ -3759,7 +3765,7 @@ int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type, 
static struct page *get_current_sit_page(struct f2fs_sb_info *sbi,

					unsigned int segno)

{

	return f2fs_get_meta_page_nofail(sbi, current_sit_addr(sbi, segno));

	return f2fs_get_meta_page(sbi, current_sit_addr(sbi, segno));

}



static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,