blockd: make most calls to 'block' asynchronous

[project/fstools.git] / blockd.c

diff --git a/blockd.c b/blockd.c
index 9bb8ab25c47e80605ce7648c95a0919a4ee7faf3..94cb02e4bbe9b3f44b35c9d6aaab4c8c144ac2e9 100644 (file)
--- a/blockd.c
+++ b/blockd.c
@@ -89,23 +89,14 @@ _find_mount_point(char *device)
        mp = find_mount_point(dev, 0);
        free(dev);
 
-       if (mp)
-               return mp;
-
-       if (asprintf(&dev, "/dev/mapper/%s", device) == -1)
-               exit(ENOMEM);
-
-       mp = find_mount_point(dev, 0);
-       free(dev);
-
        return mp;
 }
 
 static int
-block(char *cmd, char *action, char *device)
+block(char *cmd, char *action, char *device, int sync, struct uloop_process *process)
 {
        pid_t pid = fork();
-       int ret = -1;
+       int ret = sync;
        int status;
        char *argv[5] = { 0 };
        int a = 0;
@@ -116,6 +107,8 @@ block(char *cmd, char *action, char *device)
                break;
 
        case 0:
+               uloop_end();
+
                argv[a++] = "/sbin/block";
                argv[a++] = cmd;
                argv[a++] = action;
@@ -125,10 +118,15 @@ block(char *cmd, char *action, char *device)
                exit(EXIT_FAILURE);
 
        default:
-               waitpid(pid, &status, 0);
-               ret = WEXITSTATUS(status);
-               if (ret)
-                       ULOG_ERR("failed to run block. %s/%s\n", action, device);
+               if (!sync && process) {
+                       process->pid = pid;
+                       uloop_process_add(process);
+               } else if (sync) {
+                       waitpid(pid, &status, 0);
+                       ret = WEXITSTATUS(status);
+                       if (ret)
+                               ULOG_ERR("failed to run block. %s/%s\n", action, device);
+               }
                break;
        }
 
@@ -192,7 +190,7 @@ static void device_mount_remove_hotplug_cb(struct uloop_process *p, int stat)
 
        mp = _find_mount_point(device->name);
        if (mp) {
-               block("autofs", "remove", device->name);
+               block("autofs", "remove", device->name, 0, NULL);
                free(mp);
        }
 
@@ -348,7 +346,7 @@ block_hotplug(struct ubus_context *ctx, struct ubus_object *obj,
                                device_mount_remove(ctx, old);
                                device_mount_add(ctx, device);
                        } else {
-                               block("mount", NULL, NULL);
+                               block("mount", NULL, NULL, 0, NULL);
                        }
                } else if (device->autofs) {
                        device_mount_add(ctx, device);
@@ -516,7 +514,9 @@ static int send_block_notification(struct ubus_context *ctx, const char *action,
        strncat(evname, action, sizeof(evname) - 1);
 
        blob_buf_init(&buf, 0);
-       blobmsg_add_string(&buf, "devname", devname);
+
+       if (devname)
+               blobmsg_add_string(&buf, "devname", devname);
 
        err = ubus_notify(ctx, &block_object, evname, buf.head, -1);
 
@@ -560,7 +560,7 @@ static void autofs_read_handler(struct uloop_fd *u, unsigned int events)
        pkt = &pktu.missing_indirect;
         ULOG_ERR("kernel is requesting a mount -> %s\n", pkt->name);
        if (lstat(pkt->name, &st) == -1)
-               if (block("autofs", "add", (char *)pkt->name))
+               if (block("autofs", "add", (char *)pkt->name, 1, NULL))
                        cmd = AUTOFS_IOC_FAIL;
 
        if (ioctl(fd_autofs_write, cmd, pkt->wait_queue_token) < 0)
@@ -572,7 +572,7 @@ static void autofs_expire(struct uloop_timeout *t)
        struct autofs_packet_expire pkt;
 
        while (ioctl(fd_autofs_write, AUTOFS_IOC_EXPIRE, &pkt) == 0)
-               block("autofs", "remove", pkt.name);
+               block("autofs", "remove", pkt.name, 1, NULL);
 
        uloop_timeout_set(t, AUTOFS_EXPIRE_TIMER);
 }
@@ -583,7 +583,7 @@ struct uloop_timeout autofs_expire_timer = {
 
 static int autofs_mount(void)
 {
-       int autofs_timeout = AUTOFS_TIMEOUT;
+       unsigned long autofs_timeout = AUTOFS_TIMEOUT;
        int kproto_version;
        int pipefd[2];
        char source[64];
@@ -632,9 +632,18 @@ static int autofs_mount(void)
        return 0;
 }
 
+static void blockd_startup_cb(struct uloop_process *p, int stat)
+{
+       send_block_notification(&conn.ctx, "ready", NULL);
+}
+
+static struct uloop_process startup_process = {
+       .cb = blockd_startup_cb,
+};
+
 static void blockd_startup(struct uloop_timeout *t)
 {
-       block("autofs", "start", NULL);
+       block("autofs", "start", NULL, 0, &startup_process);
 }
 
 struct uloop_timeout startup = {