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

Commit 59a5cea4 authored by Chao Yu's avatar Chao Yu Committed by Greg Kroah-Hartman
Browse files

f2fs: use generic EFSBADCRC/EFSCORRUPTED 



[ Upstream commit 10f966bbf521bb9b2e497bbca496a5141f4071d0 ]

f2fs uses EFAULT as error number to indicate filesystem is corrupted
all the time, but generic filesystems use EUCLEAN for such condition,
we need to change to follow others.

This patch adds two new macros as below to wrap more generic error
code macros, and spread them in code.

EFSBADCRC	EBADMSG		/* Bad CRC detected */
EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fc3d2964

fs/f2fs/checkpoint.c

+9 −3
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	unsigned int cp_blks = 1 + __cp_payload(sbi);

	block_t cp_blk_no;

	int i;

	int err;



	sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks),

				 GFP_KERNEL);
@@ -876,6 +877,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	} else if (cp2) {

		cur_page = cp2;

	} else {

		err = -EFSCORRUPTED;

		goto fail_no_cp;

	}
@@ -888,8 +890,10 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
		sbi->cur_cp_pack = 2;



	/* Sanity checking of checkpoint */

	if (f2fs_sanity_check_ckpt(sbi))

	if (f2fs_sanity_check_ckpt(sbi)) {

		err = -EFSCORRUPTED;

		goto free_fail_no_cp;

	}



	if (cp_blks <= 1)

		goto done;
@@ -903,8 +907,10 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
		unsigned char *ckpt = (unsigned char *)sbi->ckpt;



		cur_page = f2fs_get_meta_page(sbi, cp_blk_no + i);

		if (IS_ERR(cur_page))

		if (IS_ERR(cur_page)) {

			err = PTR_ERR(cur_page);

			goto free_fail_no_cp;

		}

		sit_bitmap_ptr = page_address(cur_page);

		memcpy(ckpt + i * blk_size, sit_bitmap_ptr, blk_size);

		f2fs_put_page(cur_page, 1);
@@ -919,7 +925,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	f2fs_put_page(cp2, 1);

fail_no_cp:

	kfree(sbi->ckpt);

	return -EINVAL;

	return err;

}



static void __add_dirty_inode(struct inode *inode, enum inode_type type)

fs/f2fs/data.c

+4 −4
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 


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

			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))

		return -EFAULT;

		return -EFSCORRUPTED;



	trace_f2fs_submit_page_bio(page, fio);

	f2fs_trace_ios(fio, 0);
@@ -1071,7 +1071,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 


	if (__is_valid_data_blkaddr(blkaddr) &&

		!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC)) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto sync_out;

	}
@@ -1755,7 +1755,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 


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

							DATA_GENERIC))

			return -EFAULT;

			return -EFSCORRUPTED;



		ipu_force = true;

		fio->need_lock = LOCK_DONE;
@@ -1781,7 +1781,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	if (__is_valid_data_blkaddr(fio->old_blkaddr) &&

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

							DATA_GENERIC)) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto out_writepage;

	}

	/*

fs/f2fs/f2fs.h

+4 −0
Original line number Diff line number Diff line
@@ -3487,3 +3487,7 @@ extern void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate, 
#endif



#endif



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */

fs/f2fs/gc.c

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 


	if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr,

						DATA_GENERIC))) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto put_page;

	}

got_it:

fs/f2fs/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) 
			"%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, "

			"run fsck to fix.",

			__func__, dn->inode->i_ino, dn->data_blkaddr);

		return -EINVAL;

		return -EFSCORRUPTED;

	}



	f2fs_bug_on(F2FS_P_SB(page), PageWriteback(page));
@@ -389,7 +389,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage, 
			"%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, "

			"run fsck to fix.",

			__func__, dir->i_ino, dn.data_blkaddr);

		err = -EINVAL;

		err = -EFSCORRUPTED;

		goto out;

	}