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 0677c34..5215ff3 100644 (file)
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/mount.h>
-#include <sys/syscall.h>
 
 #include <asm/byteorder.h>
 
@@ -35,18 +34,6 @@
 
 static bool keep_sysupgrade;
 
-static ssize_t
-fs_getxattr(const char *path, const char *name, void *value, size_t size)
-{
-       return syscall(__NR_getxattr, path, name, value, size);
-}
-
-static ssize_t
-fs_setxattr(const char *path, const char *name, const void *value, size_t size, int flags)
-{
-       return syscall(__NR_setxattr, path, name, value, size, flags);
-}
-
 static int
 handle_rmdir(const char *dir)
 {
@@ -80,6 +67,7 @@ handle_rmdir(const char *dir)
 void
 foreachdir(const char *dir, int (*cb)(const char*))
 {
+       struct stat s = { 0 };
        char globdir[256];
        glob_t gl;
        int j;
@@ -90,9 +78,16 @@ foreachdir(const char *dir, int (*cb)(const char*))
                snprintf(globdir, 256, "%s/*", dir); /**/
 
        if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
-               for (j = 0; j < gl.gl_pathc; j++)
-                       foreachdir(gl.gl_pathv[j], cb);
+               for (j = 0; j < gl.gl_pathc; j++) {
+                       char *dir = gl.gl_pathv[j];
+                       int len = strlen(gl.gl_pathv[j]);
+
+                       if (len > 1 && dir[len - 1] == '/')
+                               dir[len - 1] = '\0';
 
+                       if (!lstat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
+                               foreachdir(gl.gl_pathv[j], cb);
+       }
        cb(dir);
 }
 
@@ -116,7 +111,7 @@ overlay_mount(struct volume *v, char *fs)
                return -1;
        }
 
-       return volume_init(v);
+       return 0;
 }
 
 static int
@@ -197,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;
@@ -262,39 +259,38 @@ 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)
 {
+       char *path;
+       char valstr[16];
        uint32_t val;
+       ssize_t len;
 
-       if (fs_getxattr(dir, "user.fs_state", &val, sizeof(val)) != sizeof(val))
+       path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
+       sprintf(path, "%s/.fs_state", dir);
+       len = readlink(path, valstr, sizeof(valstr) - 1);
+       if (len < 0)
                return FS_STATE_UNKNOWN;
 
+       valstr[len] = 0;
+       val = atoi(valstr);
+
        if (val > __FS_STATE_LAST)
                return FS_STATE_UNKNOWN;
 
@@ -304,9 +300,18 @@ enum fs_state fs_state_get(const char *dir)
 
 int fs_state_set(const char *dir, enum fs_state state)
 {
-       uint32_t val = 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);
+       snprintf(valstr, sizeof(valstr), "%d", state);
 
-       return fs_setxattr(dir, "user.fs_state", &val, sizeof(val), 0);
+       return symlink(valstr, path);
 }