2 files changed, 17 insertions, 4 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index d52a15799488..1982fc7c1eea 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -644,6 +644,12 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)
         if (!is_set_ckpt_flags(sbi, CP_ORPHAN_PRESENT_FLAG))
                 return 0;
 
+        if (bdev_read_only(sbi->sb->s_bdev)) {
+                f2fs_msg(sbi->sb, KERN_INFO, "write access "
+                        "unavailable, skipping orphan cleanup");
+                return 0;
+        }
+
         if (s_flags & SB_RDONLY) {
                 f2fs_msg(sbi->sb, KERN_INFO, "orphan cleanup on readonly fs");
                 sbi->sb->s_flags &= ~SB_RDONLY;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 29d985cf8301..4f8e9ab48b26 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3377,10 +3377,17 @@ try_onemore:
                  * mount should be failed, when device has readonly mode, and
                  * previous checkpoint was not done by clean system shutdown.
                  */
-                if (f2fs_hw_is_readonly(sbi) &&
-                                !is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
-                        err = -EROFS;
-                        goto free_meta;
+                if (f2fs_hw_is_readonly(sbi)) {
+                        if (!is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
+                                err = -EROFS;
+                                f2fs_msg(sb, KERN_ERR,
+                                        "Need to recover fsync data, but "
+                                        "write access unavailable");
+                                goto free_meta;
+                        }
+                        f2fs_msg(sbi->sb, KERN_INFO, "write access "
+                                "unavailable, skipping recovery");
+                        goto reset_checkpoint;
                 }
 
                 if (need_fsck)