Commit 31f85ccc authored by Zhiguo Niu's avatar Zhiguo Niu Committed by Jaegeuk Kim
Browse files

f2fs: unify the error handling of f2fs_is_valid_blkaddr 



There are some cases of f2fs_is_valid_blkaddr not handled as
ERROR_INVALID_BLKADDR,so unify the error handling about all of
f2fs_is_valid_blkaddr.
Do f2fs_handle_error in __f2fs_is_valid_blkaddr for cleanup.

Signed-off-by: default avatarZhiguo Niu <zhiguo.niu@unisoc.com>
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 11bec96a

fs/f2fs/checkpoint.c

+22 −18
Original line number Diff line number Diff line
@@ -154,19 +154,20 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, 
	if (unlikely(f2fs_cp_error(sbi)))

		return exist;



	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {

		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",

			 blkaddr, exist);

		set_sbi_flag(sbi, SBI_NEED_FSCK);

	if ((exist && type == DATA_GENERIC_ENHANCE_UPDATE) ||

		(!exist && type == DATA_GENERIC_ENHANCE))

		goto out_err;

	if (!exist && type != DATA_GENERIC_ENHANCE_UPDATE)

		goto out_handle;

	return exist;

	}



	if (!exist && type == DATA_GENERIC_ENHANCE) {

out_err:

	f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",

		 blkaddr, exist);

	set_sbi_flag(sbi, SBI_NEED_FSCK);

	dump_stack();

	}

out_handle:

	f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

	return exist;

}
@@ -178,22 +179,22 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, 
		break;

	case META_SIT:

		if (unlikely(blkaddr >= SIT_BLK_CNT(sbi)))

			return false;

			goto err;

		break;

	case META_SSA:

		if (unlikely(blkaddr >= MAIN_BLKADDR(sbi) ||

			blkaddr < SM_I(sbi)->ssa_blkaddr))

			return false;

			goto err;

		break;

	case META_CP:

		if (unlikely(blkaddr >= SIT_I(sbi)->sit_base_addr ||

			blkaddr < __start_cp_addr(sbi)))

			return false;

			goto err;

		break;

	case META_POR:

		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||

			blkaddr < MAIN_BLKADDR(sbi)))

			return false;

			goto err;

		break;

	case DATA_GENERIC:

	case DATA_GENERIC_ENHANCE:
@@ -210,7 +211,7 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, 
				  blkaddr);

			set_sbi_flag(sbi, SBI_NEED_FSCK);

			dump_stack();

			return false;

			goto err;

		} else {

			return __is_bitmap_valid(sbi, blkaddr, type);

		}
@@ -218,13 +219,16 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, 
	case META_GENERIC:

		if (unlikely(blkaddr < SEG0_BLKADDR(sbi) ||

			blkaddr >= MAIN_BLKADDR(sbi)))

			return false;

			goto err;

		break;

	default:

		BUG();

	}



	return true;

err:

	f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

	return false;

}



bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

fs/f2fs/data.c

+3 −19
Original line number Diff line number Diff line
@@ -690,10 +690,8 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 


	if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,

			fio->is_por ? META_POR : (__is_meta_io(fio) ?

			META_GENERIC : DATA_GENERIC_ENHANCE))) {

		f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);

			META_GENERIC : DATA_GENERIC_ENHANCE)))

		return -EFSCORRUPTED;

	}



	trace_f2fs_submit_page_bio(page, fio);
@@ -888,10 +886,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) 
			fio->encrypted_page : fio->page;



	if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,

			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) {

		f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);

			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))

		return -EFSCORRUPTED;

	}



	trace_f2fs_submit_page_bio(page, fio);
@@ -1219,8 +1215,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, 
		if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr,

						DATA_GENERIC_ENHANCE_READ)) {

			err = -EFSCORRUPTED;

			f2fs_handle_error(F2FS_I_SB(inode),

						ERROR_INVALID_BLKADDR);

			goto put_err;

		}

		goto got_it;
@@ -1246,8 +1240,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, 
						dn.data_blkaddr,

						DATA_GENERIC_ENHANCE)) {

		err = -EFSCORRUPTED;

		f2fs_handle_error(F2FS_I_SB(inode),

					ERROR_INVALID_BLKADDR);

		goto put_err;

	}

got_it:
@@ -1578,7 +1570,6 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag) 
	if (!is_hole &&

	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {

		err = -EFSCORRUPTED;

		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

		goto sync_out;

	}
@@ -2102,8 +2093,6 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, 
		if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), block_nr,

						DATA_GENERIC_ENHANCE_READ)) {

			ret = -EFSCORRUPTED;

			f2fs_handle_error(F2FS_I_SB(inode),

						ERROR_INVALID_BLKADDR);

			goto out;

		}

	} else {
@@ -2641,11 +2630,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	    f2fs_lookup_read_extent_cache_block(inode, page->index,

						&fio->old_blkaddr)) {

		if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,

						DATA_GENERIC_ENHANCE)) {

			f2fs_handle_error(fio->sbi,

						ERROR_INVALID_BLKADDR);

						DATA_GENERIC_ENHANCE))

			return -EFSCORRUPTED;

		}



		ipu_force = true;

		fio->need_lock = LOCK_DONE;
@@ -2673,7 +2659,6 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
		!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,

						DATA_GENERIC_ENHANCE)) {

		err = -EFSCORRUPTED;

		f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);

		goto out_writepage;

	}
@@ -3640,7 +3625,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
		if (!f2fs_is_valid_blkaddr(sbi, blkaddr,

				DATA_GENERIC_ENHANCE_READ)) {

			err = -EFSCORRUPTED;

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			goto fail;

		}

		err = f2fs_submit_page_read(use_cow ?

fs/f2fs/extent_cache.c

+1 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ bool sanity_check_extent_cache(struct inode *inode) 
	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||

	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,

					DATA_GENERIC_ENHANCE)) {

		set_sbi_flag(sbi, SBI_NEED_FSCK);

		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",

			  __func__, inode->i_ino,

			  ei->blk, ei->fofs, ei->len);
@@ -856,10 +855,8 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei, 
		goto out;



	if (__is_valid_data_blkaddr(blkaddr) &&

	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {

		f2fs_bug_on(sbi, 1);

	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE))

		return -EINVAL;

	}

out:

	/*

	 * init block age with zero, this can happen when the block age extent

fs/f2fs/file.c

+3 −13
Original line number Diff line number Diff line
@@ -608,10 +608,8 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) 
			if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE))

				continue;

			if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr,

						DATA_GENERIC_ENHANCE)) {

				f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

						DATA_GENERIC_ENHANCE))

				continue;

			}

			if (compressed_cluster)

				valid_blocks++;

		}
@@ -1209,7 +1207,6 @@ static int __read_out_blkaddrs(struct inode *inode, block_t *blkaddr, 
			!f2fs_is_valid_blkaddr(sbi, *blkaddr,

					DATA_GENERIC_ENHANCE)) {

			f2fs_put_dnode(&dn);

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			return -EFSCORRUPTED;

		}
@@ -1495,7 +1492,6 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start, 
		if (!f2fs_is_valid_blkaddr(sbi, dn->data_blkaddr,

					DATA_GENERIC_ENHANCE)) {

			ret = -EFSCORRUPTED;

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			break;

		}
@@ -3474,11 +3470,9 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count) 
		if (!__is_valid_data_blkaddr(blkaddr))

			continue;

		if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,

					DATA_GENERIC_ENHANCE))) {

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

					DATA_GENERIC_ENHANCE)))

			return -EFSCORRUPTED;

	}

	}



	while (count) {

		int compr_blocks = 0;
@@ -3639,11 +3633,9 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count, 
		if (!__is_valid_data_blkaddr(blkaddr))

			continue;

		if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,

					DATA_GENERIC_ENHANCE))) {

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

					DATA_GENERIC_ENHANCE)))

			return -EFSCORRUPTED;

	}

	}



	while (count) {

		int compr_blocks = 0;
@@ -3924,8 +3916,6 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg) 
						DATA_GENERIC_ENHANCE)) {

				ret = -EFSCORRUPTED;

				f2fs_put_dnode(&dn);

				f2fs_handle_error(sbi,

						ERROR_INVALID_BLKADDR);

				goto out;

			}

fs/f2fs/gc.c

+0 −2
Original line number Diff line number Diff line
@@ -1195,7 +1195,6 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 
		if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr,

						DATA_GENERIC_ENHANCE_READ))) {

			err = -EFSCORRUPTED;

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			goto put_page;

		}

		goto got_it;
@@ -1214,7 +1213,6 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 
	if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr,

						DATA_GENERIC_ENHANCE))) {

		err = -EFSCORRUPTED;

		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

		goto put_page;

	}

got_it: