block: properly handle vlist_add() for label, uuid and device cases

[project/ubox.git] / block.c

diff --git a/block.c b/block.c
index ff35ba7..c9285d6 100644 (file)
--- a/block.c
+++ b/block.c
@@ -114,6 +114,7 @@ static const struct uci_blob_param_list mount_attr_list = {
 enum {
        SWAP_ENABLE,
        SWAP_UUID,
+       SWAP_LABEL,
        SWAP_DEVICE,
        SWAP_PRIO,
        __SWAP_MAX
@@ -122,6 +123,7 @@ enum {
 static const struct blobmsg_policy swap_policy[__SWAP_MAX] = {
        [SWAP_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },
        [SWAP_UUID] = { .name = "uuid", .type = BLOBMSG_TYPE_STRING },
+       [SWAP_LABEL] = { .name = "label", .type = BLOBMSG_TYPE_STRING },
        [SWAP_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
        [SWAP_PRIO] = { .name = "priority", .type = BLOBMSG_TYPE_INT32 },
 };
@@ -282,21 +284,32 @@ static int swap_add(struct uci_section *s)
        uci_to_blob(&b, s, &swap_attr_list);
        blobmsg_parse(swap_policy, __SWAP_MAX, tb, blob_data(b.head), blob_len(b.head));
 
-       if (!tb[SWAP_UUID] && !tb[SWAP_DEVICE])
+       if (!tb[SWAP_UUID] && !tb[SWAP_LABEL] && !tb[SWAP_DEVICE])
                return -1;
 
        m = malloc(sizeof(struct mount));
        memset(m, 0, sizeof(struct mount));
        m->type = TYPE_SWAP;
        m->uuid = blobmsg_get_strdup(tb[SWAP_UUID]);
+       m->label = blobmsg_get_strdup(tb[SWAP_LABEL]);
        m->device = blobmsg_get_basename(tb[SWAP_DEVICE]);
        if (tb[SWAP_PRIO])
                m->prio = blobmsg_get_u32(tb[SWAP_PRIO]);
        if (m->prio)
                m->prio = ((m->prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER;
 
-       if ((!tb[SWAP_ENABLE]) || blobmsg_get_u32(tb[SWAP_ENABLE]))
-               vlist_add(&mounts, &m->node, (m->uuid) ? (m->uuid) : (m->device));
+       if ((!tb[SWAP_ENABLE]) || blobmsg_get_u32(tb[SWAP_ENABLE])) {
+               /* store complete swap path */
+               if (tb[SWAP_DEVICE])
+                       m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]);
+
+               if (m->uuid)
+                       vlist_add(&mounts, &m->node, m->uuid);
+               else if (m->label)
+                       vlist_add(&mounts, &m->node, m->label);
+               else if (m->device)
+                       vlist_add(&mounts, &m->node, m->device);
+       }
 
        return 0;
 }
@@ -328,7 +341,7 @@ static int global_add(struct uci_section *s)
        return 0;
 }
 
-static struct mount* find_swap(const char *uuid, const char *device)
+static struct mount* find_swap(const char *uuid, const char *label, const char *device)
 {
        struct mount *m;
 
@@ -337,6 +350,8 @@ static struct mount* find_swap(const char *uuid, const char *device)
                        continue;
                if (uuid && m->uuid && !strcmp(m->uuid, uuid))
                        return m;
+               if (label && m->label && !strcmp(m->label, label))
+                       return m;
                if (device && m->device && !strcmp(m->device, device))
                        return m;
        }
@@ -404,6 +419,26 @@ static int config_load(char *cfg)
        return 0;
 }
 
+static struct blkid_struct_probe* _probe_path(char *path)
+{
+       struct blkid_struct_probe *pr;
+
+       pr = malloc(sizeof(*pr));
+
+       if (!pr)
+               return NULL;
+
+       memset(pr, 0, sizeof(*pr));
+       probe_block(path, pr);
+
+       if (pr->err || !pr->id) {
+               free(pr);
+               return NULL;
+       }
+
+       return pr;
+}
+
 static int _cache_load(const char *path)
 {
        int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
@@ -414,12 +449,8 @@ static int _cache_load(const char *path)
                return -1;
 
        for (j = 0; j < gl.gl_pathc; j++) {
-               struct blkid_struct_probe *pr = malloc(sizeof(struct blkid_struct_probe));
-               memset(pr, 0, sizeof(struct blkid_struct_probe));
-               probe_block(gl.gl_pathv[j], pr);
-               if (pr->err || !pr->id)
-                       free(pr);
-               else
+               struct blkid_struct_probe *pr = _probe_path(gl.gl_pathv[j]);
+               if (pr)
                        list_add_tail(&pr->list, &devices);
        }
 
@@ -568,6 +599,36 @@ static void check_filesystem(struct blkid_struct_probe *pr)
        }
 }
 
+static void handle_swapfiles(bool on)
+{
+       struct stat s;
+       struct mount *m;
+       struct blkid_struct_probe *pr;
+
+       vlist_for_each_element(&mounts, m, node)
+       {
+               if (m->type != TYPE_SWAP || !m->target)
+                       continue;
+
+               if (stat(m->target, &s) || !S_ISREG(s.st_mode))
+                       continue;
+
+               pr = _probe_path(m->target);
+
+               if (!pr)
+                       continue;
+
+               if (!strcmp(pr->id->name, "swap")) {
+                       if (on)
+                               swapon(pr->dev, m->prio);
+                       else
+                               swapoff(pr->dev);
+               }
+
+               free(pr);
+       }
+}
+
 static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 {
        struct mount *m;
@@ -581,7 +642,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
        if (!strcmp(pr->id->name, "swap")) {
                if (hotplug && !auto_swap)
                        return -1;
-               m = find_swap(pr->uuid, device);
+               m = find_swap(pr->uuid, pr->label, device);
                if (m || anon_swap)
                        swapon(pr->dev, (m) ? (m->prio) : (0));
 
@@ -619,6 +680,8 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
                if (err)
                        fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
                                        pr->dev, pr->id->name, target, err, strerror(err));
+               else
+                       handle_swapfiles(true);
                return err;
        }
 
@@ -636,6 +699,8 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
                if (err)
                        fprintf(stderr, "mounting %s (%s) as %s failed (%d) - %s\n",
                                        pr->dev, pr->id->name, target, err, strerror(err));
+               else
+                       handle_swapfiles(true);
                return err;
        }
 
@@ -898,6 +963,8 @@ static int main_mount(int argc, char **argv)
        list_for_each_entry(pr, &devices, list)
                mount_device(pr, 0);
 
+       handle_swapfiles(true);
+
        return 0;
 }
 
@@ -908,6 +975,8 @@ static int main_umount(int argc, char **argv)
        if (config_load(NULL))
                return -1;
 
+       handle_swapfiles(false);
+
        cache_load(0);
        list_for_each_entry(pr, &devices, list)
                umount_device(pr);