fsck.f2fs: allow to fsck readonly image w/ -f option

To keep line with e2fsprogs, let's allow to fsck mounted image as
readonly w/ -f option.

Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fsck/main.c b/fsck/main.c
index 675c603..bb79f6e 100644 (file)
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[])
                        case 'f':
                        case 'y':
                                c.fix_on = 1;
+                               c.force = 1;
                                MSG(0, "Info: Force to fix corruption\n");
                                break;
                        case 'q':

diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index 65cc8fd..6eebb3a 100644 (file)
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -369,6 +369,7 @@ struct f2fs_configuration {
        void *private;
        int dry_run;
        int fix_on;
+       int force;
        int defset;
        int bug_on;
        int alloc_failed;

diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index a0079ad..c692bf2 100644 (file)
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -825,7 +825,7 @@ int get_device_info(int i)
                        return -1;
                }
 
-               if (S_ISBLK(stat_buf->st_mode))
+               if (S_ISBLK(stat_buf->st_mode) && !c.force)
                        fd = open(dev->path, O_RDWR | O_EXCL);
                else
                        fd = open(dev->path, O_RDWR);