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

Commit 10f966bb authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: use generic EFSBADCRC/EFSCORRUPTED 



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>
parent f91108b8

fs/f2fs/checkpoint.c

+9 −3
Original line number Diff line number Diff line
@@ -890,6 +890,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);
@@ -917,6 +918,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	} else if (cp2) {

		cur_page = cp2;

	} else {

		err = -EFSCORRUPTED;

		goto fail_no_cp;

	}
@@ -929,8 +931,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;
@@ -944,8 +948,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);
@@ -960,7 +966,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	f2fs_put_page(cp2, 1);

fail_no_cp:

	kvfree(sbi->ckpt);

	return -EINVAL;

	return err;

}



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

fs/f2fs/data.c

+9 −9
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ 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)))

		return -EFAULT;

		return -EFSCORRUPTED;



	trace_f2fs_submit_page_bio(page, fio);

	f2fs_trace_ios(fio, 0);
@@ -489,7 +489,7 @@ int f2fs_merge_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);
@@ -789,7 +789,7 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, 
		dn.data_blkaddr = ei.blk + index - ei.fofs;

		if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr,

						DATA_GENERIC_ENHANCE_READ)) {

			err = -EFAULT;

			err = -EFSCORRUPTED;

			goto put_err;

		}

		goto got_it;
@@ -809,7 +809,7 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, 
			!f2fs_is_valid_blkaddr(F2FS_I_SB(inode),

						dn.data_blkaddr,

						DATA_GENERIC_ENHANCE)) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto put_err;

	}

got_it:
@@ -1155,7 +1155,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_ENHANCE)) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto sync_out;

	}
@@ -1625,7 +1625,7 @@ 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 = -EFAULT;

			ret = -EFSCORRUPTED;

			goto out;

		}

	} else {
@@ -1906,7 +1906,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 


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

						DATA_GENERIC_ENHANCE))

			return -EFAULT;

			return -EFSCORRUPTED;



		ipu_force = true;

		fio->need_lock = LOCK_DONE;
@@ -1933,7 +1933,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_ENHANCE)) {

		err = -EFAULT;

		err = -EFSCORRUPTED;

		goto out_writepage;

	}

	/*
@@ -2606,7 +2606,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
	} else {

		if (!f2fs_is_valid_blkaddr(sbi, blkaddr,

				DATA_GENERIC_ENHANCE_READ)) {

			err = -EFAULT;

			err = -EFSCORRUPTED;

			goto fail;

		}

		err = f2fs_submit_page_read(inode, page, blkaddr);

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
			f2fs_warn(sbi, "%s: corrupted namelen=%d, run fsck to fix.",

				  __func__, le16_to_cpu(de->name_len));

			set_sbi_flag(sbi, SBI_NEED_FSCK);

			err = -EINVAL;

			err = -EFSCORRUPTED;

			goto out;

		}

fs/f2fs/f2fs.h

+3 −0
Original line number Diff line number Diff line
@@ -3708,4 +3708,7 @@ static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) 
	return false;

}



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */



#endif /* _LINUX_F2FS_H */

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ static int __read_out_blkaddrs(struct inode *inode, block_t *blkaddr, 
			!f2fs_is_valid_blkaddr(sbi, *blkaddr,

					DATA_GENERIC_ENHANCE)) {

			f2fs_put_dnode(&dn);

			return -EFAULT;

			return -EFSCORRUPTED;

		}



		if (!f2fs_is_checkpointed_data(sbi, *blkaddr)) {