Commit 95fa90c9 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: support recording errors into superblock 



This patch supports to record detail reason of FSCORRUPTED error into
f2fs_super_block.s_errors[].

Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent a9cfee0e

fs/f2fs/compress.c

+2 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task) 


	if (dic->clen > PAGE_SIZE * dic->nr_cpages - COMPRESS_HEADER_SIZE) {

		ret = -EFSCORRUPTED;

		f2fs_handle_error(sbi, ERROR_FAIL_DECOMPRESSION);

		goto out_release;

	}
@@ -950,6 +951,7 @@ static int __f2fs_cluster_blocks(struct inode *inode, 


	if (f2fs_sanity_check_cluster(&dn)) {

		ret = -EFSCORRUPTED;

		f2fs_handle_error(F2FS_I_SB(inode), ERROR_CORRUPTED_CLUSTER);

		goto fail;

	}

fs/f2fs/data.c

+21 −3
Original line number Diff line number Diff line
@@ -705,8 +705,10 @@ 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)))

			META_GENERIC : DATA_GENERIC_ENHANCE))) {

		f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);

		return -EFSCORRUPTED;

	}



	trace_f2fs_submit_page_bio(page, fio);
@@ -906,8 +908,10 @@ 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))

			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) {

		f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);

		return -EFSCORRUPTED;

	}



	trace_f2fs_submit_page_bio(page, fio);
@@ -1217,6 +1221,8 @@ 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;
@@ -1237,6 +1243,8 @@ 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:
@@ -1550,6 +1558,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 = -EFSCORRUPTED;

		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

		goto sync_out;

	}
@@ -1595,6 +1604,8 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
					(flag != F2FS_GET_BLOCK_FIEMAP ||

					IS_ENABLED(CONFIG_F2FS_CHECK_FS))) {

				err = -EFSCORRUPTED;

				f2fs_handle_error(sbi,

						ERROR_CORRUPTED_CLUSTER);

				goto sync_out;

			}

			if (flag == F2FS_GET_BLOCK_BMAP) {
@@ -2076,6 +2087,8 @@ 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 {
@@ -2619,8 +2632,11 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
		fio->old_blkaddr = ei.blk + page->index - ei.fofs;



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

						DATA_GENERIC_ENHANCE))

						DATA_GENERIC_ENHANCE)) {

			f2fs_handle_error(fio->sbi,

						ERROR_INVALID_BLKADDR);

			return -EFSCORRUPTED;

		}



		ipu_force = true;

		fio->need_lock = LOCK_DONE;
@@ -2648,6 +2664,7 @@ 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;

	}
@@ -3561,6 +3578,7 @@ 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(inode, page, blkaddr, 0, true);

fs/f2fs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
				  __func__, le16_to_cpu(de->name_len));

			set_sbi_flag(sbi, SBI_NEED_FSCK);

			err = -EFSCORRUPTED;

			f2fs_handle_error(sbi, ERROR_CORRUPTED_DIRENT);

			goto out;

		}

fs/f2fs/f2fs.h

+5 −0
Original line number Diff line number Diff line
@@ -1815,6 +1815,10 @@ struct f2fs_sb_info { 


	struct workqueue_struct *post_read_wq;	/* post read workqueue */



	unsigned char errors[MAX_F2FS_ERRORS];	/* error flags */

	spinlock_t error_lock;			/* protect errors array */

	bool error_dirty;			/* errors of sb is dirty */



	struct kmem_cache *inline_xattr_slab;	/* inline xattr entry */

	unsigned int inline_xattr_slab_size;	/* default inline xattr slab size */
@@ -3557,6 +3561,7 @@ int f2fs_quota_sync(struct super_block *sb, int type); 
loff_t max_file_blocks(struct inode *inode);

void f2fs_quota_off_umount(struct super_block *sb);

void f2fs_handle_stop(struct f2fs_sb_info *sbi, unsigned char reason);

void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error);

int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover);

int f2fs_sync_fs(struct super_block *sb, int sync);

int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi);

fs/f2fs/file.c

+10 −2
Original line number Diff line number Diff line
@@ -1156,6 +1156,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);

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			return -EFSCORRUPTED;

		}
@@ -1440,6 +1441,7 @@ 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;

		}
@@ -3323,9 +3325,11 @@ 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)))

					DATA_GENERIC_ENHANCE))) {

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			return -EFSCORRUPTED;

		}

	}



	while (count) {

		int compr_blocks = 0;
@@ -3485,9 +3489,11 @@ 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)))

					DATA_GENERIC_ENHANCE))) {

			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);

			return -EFSCORRUPTED;

		}

	}



	while (count) {

		int compr_blocks = 0;
@@ -3758,6 +3764,8 @@ 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;

			}