libfstools: add f2fs filesystem type and simplify fs type code

[project/fstools.git] / libfstools / overlay.c

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 7f69606..5215ff3 100644 (file)
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -111,7 +111,7 @@ overlay_mount(struct volume *v, char *fs)
                return -1;
        }
 
-       return volume_init(v);
+       return 0;
 }
 
 static int
@@ -192,64 +192,66 @@ handle_whiteout(const char *dir)
        return 0;
 }
 
+static char *overlay_fs_name(int type)
+{
+       switch (type) {
+               case FS_F2FS:
+                       return "f2fs";
+               case FS_UBIFS:
+                       return "ubifs";
+               case FS_JFFS2:
+               default:
+                       return "jffs2";
+       }
+}
+
 int
 jffs2_switch(struct volume *v)
 {
        char *mp;
-       int ret = -1;
+       int type;
 
        if (find_overlay_mount("overlayfs:/tmp/root"))
                return -1;
 
        if (find_filesystem("overlay")) {
                ULOG_ERR("overlayfs not supported by kernel\n");
-               return ret;
+               return -1;
        }
 
+       volume_init(v);
        mp = find_mount_point(v->blk, 0);
        if (mp) {
                ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk, mp);
                return -1;
        }
 
-       switch (volume_identify(v)) {
+       type = volume_identify(v);
+       switch (type) {
        case FS_NONE:
                ULOG_ERR("no jffs2 marker found\n");
                /* fall through */
 
        case FS_DEADCODE:
-               ret = switch2jffs(v);
-               if (!ret) {
-                       ULOG_INFO("performing overlay whiteout\n");
-                       umount2("/tmp/root", MNT_DETACH);
-                       foreachdir("/overlay/", handle_whiteout);
-               }
-               break;
+               if (switch2jffs(v))
+                       return -1;
 
-       case FS_JFFS2:
-               ret = overlay_mount(v, "jffs2");
-               if (ret)
-                       break;
-               if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
-                       ULOG_ERR("switching to jffs2 failed\n");
-                       ret = -1;
-               }
+               ULOG_INFO("performing overlay whiteout\n");
+               umount2("/tmp/root", MNT_DETACH);
+               foreachdir("/overlay/", handle_whiteout);
                break;
 
+       case FS_F2FS:
        case FS_UBIFS:
-               ret = overlay_mount(v, "ubifs");
-               if (ret)
-                       break;
+               if (overlay_mount(v, overlay_fs_name(type)))
+                       return -1;
                if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
-                       ULOG_ERR("switching to ubifs failed\n");
-                       ret = -1;
+                       ULOG_ERR("switching to jffs2 failed\n");
+                       return -1;
                }
                break;
        }
 
-       if (ret)
-               return ret;
-
        sync();
        fs_state_set("/overlay", FS_STATE_READY);
        return 0;
@@ -257,30 +259,20 @@ jffs2_switch(struct volume *v)
 
 static int overlay_mount_fs(struct volume *v)
 {
-       char *fstype;
+       char *fstype = overlay_fs_name(volume_identify(v));
 
        if (mkdir("/tmp/overlay", 0755)) {
                ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
                return -1;
        }
 
-       fstype = "jffs2";
-
-       switch (volume_identify(v)) {
-       case FS_UBIFS:
-               fstype = "ubifs";
-               break;
-       }
-
-       volume_init(v);
-
        if (mount(v->blk, "/tmp/overlay", fstype, MS_NOATIME, NULL)) {
                ULOG_ERR("failed to mount -t %s %s /tmp/overlay: %s\n",
                         fstype, v->blk, strerror(errno));
                return -1;
        }
 
-       return -1;
+       return 0;
 }
 
 enum fs_state fs_state_get(const char *dir)
@@ -311,6 +303,9 @@ int fs_state_set(const char *dir, enum fs_state state)
        char valstr[16];
        char *path;
 
+       if (fs_state_get(dir) == state)
+               return 0;
+
        path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
        sprintf(path, "%s/.fs_state", dir);
        unlink(path);