f2fs: give -EINVAL for norecovery and rw mount
Once detecting something to recover, f2fs should stop mounting, given norecovery and rw mount options. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Родитель
df728b0f69
Коммит
6781eabba1
|
@ -1907,7 +1907,7 @@ void build_gc_manager(struct f2fs_sb_info *);
|
||||||
/*
|
/*
|
||||||
* recovery.c
|
* recovery.c
|
||||||
*/
|
*/
|
||||||
int recover_fsync_data(struct f2fs_sb_info *);
|
int recover_fsync_data(struct f2fs_sb_info *, bool);
|
||||||
bool space_for_roll_forward(struct f2fs_sb_info *);
|
bool space_for_roll_forward(struct f2fs_sb_info *);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -551,12 +551,13 @@ next:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
int recover_fsync_data(struct f2fs_sb_info *sbi)
|
int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
|
||||||
{
|
{
|
||||||
struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);
|
struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);
|
||||||
struct list_head inode_list;
|
struct list_head inode_list;
|
||||||
block_t blkaddr;
|
block_t blkaddr;
|
||||||
int err;
|
int err;
|
||||||
|
int ret = 0;
|
||||||
bool need_writecp = false;
|
bool need_writecp = false;
|
||||||
|
|
||||||
fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",
|
fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",
|
||||||
|
@ -573,11 +574,13 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)
|
||||||
|
|
||||||
/* step #1: find fsynced inode numbers */
|
/* step #1: find fsynced inode numbers */
|
||||||
err = find_fsync_dnodes(sbi, &inode_list);
|
err = find_fsync_dnodes(sbi, &inode_list);
|
||||||
if (err)
|
if (err || list_empty(&inode_list))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (list_empty(&inode_list))
|
if (check_only) {
|
||||||
|
ret = 1;
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
need_writecp = true;
|
need_writecp = true;
|
||||||
|
|
||||||
|
@ -625,5 +628,5 @@ out:
|
||||||
} else {
|
} else {
|
||||||
mutex_unlock(&sbi->cp_mutex);
|
mutex_unlock(&sbi->cp_mutex);
|
||||||
}
|
}
|
||||||
return err;
|
return ret ? ret: err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1562,14 +1562,24 @@ try_onemore:
|
||||||
if (need_fsck)
|
if (need_fsck)
|
||||||
set_sbi_flag(sbi, SBI_NEED_FSCK);
|
set_sbi_flag(sbi, SBI_NEED_FSCK);
|
||||||
|
|
||||||
err = recover_fsync_data(sbi);
|
err = recover_fsync_data(sbi, false);
|
||||||
if (err) {
|
if (err < 0) {
|
||||||
need_fsck = true;
|
need_fsck = true;
|
||||||
f2fs_msg(sb, KERN_ERR,
|
f2fs_msg(sb, KERN_ERR,
|
||||||
"Cannot recover all fsync data errno=%ld", err);
|
"Cannot recover all fsync data errno=%ld", err);
|
||||||
goto free_kobj;
|
goto free_kobj;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
err = recover_fsync_data(sbi, true);
|
||||||
|
|
||||||
|
if (!f2fs_readonly(sb) && err > 0) {
|
||||||
|
err = -EINVAL;
|
||||||
|
f2fs_msg(sb, KERN_ERR,
|
||||||
|
"Need to recover fsync data");
|
||||||
|
goto free_kobj;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* recover_fsync_data() cleared this already */
|
/* recover_fsync_data() cleared this already */
|
||||||
clear_sbi_flag(sbi, SBI_POR_DOING);
|
clear_sbi_flag(sbi, SBI_POR_DOING);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче