projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f2fs: give -EINVAL for norecovery and rw mount
[deliverable/linux.git]
/
fs
/
f2fs
/
super.c
diff --git
a/fs/f2fs/super.c
b/fs/f2fs/super.c
index f5fbbfdb3d93d8049bae40ca4263cddbfc8baad3..8f9648ffbbc30499e46c4b9484cee2fce8e6e1c4 100644
(file)
--- a/
fs/f2fs/super.c
+++ b/
fs/f2fs/super.c
@@
-1562,14
+1562,24
@@
try_onemore:
if (need_fsck)
set_sbi_flag(sbi, SBI_NEED_FSCK);
if (need_fsck)
set_sbi_flag(sbi, SBI_NEED_FSCK);
- err = recover_fsync_data(sbi);
- if (err) {
+ err = recover_fsync_data(sbi
, false
);
+ if (err
< 0
) {
need_fsck = true;
f2fs_msg(sb, KERN_ERR,
"Cannot recover all fsync data errno=%ld", err);
goto free_kobj;
}
need_fsck = true;
f2fs_msg(sb, KERN_ERR,
"Cannot recover all fsync data errno=%ld", err);
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 */
clear_sbi_flag(sbi, SBI_POR_DOING);
/* recover_fsync_data() cleared this already */
clear_sbi_flag(sbi, SBI_POR_DOING);
This page took
0.028414 seconds
and
5
git commands to generate.