diff options
| author | Chao Yu <yuchao0@huawei.com> | 2021-03-31 11:16:32 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2021-03-30 20:58:15 -0700 |
| commit | 23738e74472f9c5f3a05a68724a2ccfba97d283d (patch) | |
| tree | 302fb3525e0c1f5ae2553379e321c4b63591bf94 /fs | |
| parent | 5911d2d1d1a38b26585383478bd71d9254e48bdf (diff) | |
| download | linux-stable-23738e74472f9c5f3a05a68724a2ccfba97d283d.tar.gz linux-stable-23738e74472f9c5f3a05a68724a2ccfba97d283d.tar.bz2 linux-stable-23738e74472f9c5f3a05a68724a2ccfba97d283d.zip | |
f2fs: fix to restrict mount condition on readonly block device
When we mount an unclean f2fs image in a readonly block device, let's
make mount() succeed only when there is no recoverable data in that
image, otherwise after mount(), file fsyned won't be recovered as user
expected.
Fixes: 938a184265d7 ("f2fs: give a warning only for readonly partition")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/super.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 954b1fe97d67..14239e2b7ae7 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3966,10 +3966,18 @@ try_onemore: * previous checkpoint was not done by clean system shutdown. */ if (f2fs_hw_is_readonly(sbi)) { - if (!is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) - f2fs_err(sbi, "Need to recover fsync data, but write access unavailable"); - else - f2fs_info(sbi, "write access unavailable, skipping recovery"); + if (!is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) { + err = f2fs_recover_fsync_data(sbi, true); + if (err > 0) { + err = -EROFS; + f2fs_err(sbi, "Need to recover fsync data, but " + "write access unavailable, please try " + "mount w/ disable_roll_forward or norecovery"); + } + if (err < 0) + goto free_meta; + } + f2fs_info(sbi, "write access unavailable, skipping recovery"); goto reset_checkpoint; } |