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

Commit 2adc3505 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: set SBI_NEED_FSCK when encountering exception in recovery 



This patch tries to set SBI_NEED_FSCK flag into sbi only when we fail to recover
in fill_super, so we could skip fscking image when we fail to fill super for
other reason.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 21cb1d99

fs/f2fs/super.c

+6 −4
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	struct buffer_head *raw_super_buf;

	struct inode *root;

	long err = -EINVAL;

	bool retry = true;

	bool retry = true, need_fsck = false;

	char *options = NULL;

	int i;
@@ -1155,9 +1155,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	if (err)

		goto free_proc;



	if (!retry)

		set_sbi_flag(sbi, SBI_NEED_FSCK);



	/* recover fsynced data */

	if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {

		/*
@@ -1169,8 +1166,13 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
			err = -EROFS;

			goto free_kobj;

		}



		if (need_fsck)

			set_sbi_flag(sbi, SBI_NEED_FSCK);



		err = recover_fsync_data(sbi);

		if (err) {

			need_fsck = true;

			f2fs_msg(sb, KERN_ERR,

				"Cannot recover all fsync data errno=%ld", err);

			goto free_kobj;