discover: remove (unused) duplicate struct mount_map

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index af48f5c6ea0648a81db4842c948011f6decde855..9589bb20d16c0e8ac57f390138aafca4ccd0b2be 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -15,6 +15,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
 
 #include "device-handler.h"
 #include "discover-server.h"

+#include "event.h"

 #include "parser.h"
 #include "udev.h"
 #include "paths.h"
 #include "parser.h"
 #include "udev.h"
 #include "paths.h"


@@ -32,11 +33,6 @@ struct device_handler {
        struct list contexts;
 };
 
        struct list contexts;
 };
 

-struct mount_map {
-       char *device_path;
-       char *mount_point;
-};
-

 /**
  * device_handler_add - Add a device to the handler device array.
  */
 /**
  * device_handler_add - Add a device to the handler device array.
  */


@@ -63,7 +59,7 @@ static void device_handler_remove(struct device_handler *handler,
                if (handler->devices[i] == device)
                        break;
 
                if (handler->devices[i] == device)
                        break;
 

-       if (i < handler->n_devices) {
+       if (i == handler->n_devices) {

                assert(0 && "unknown device");
                return;
        }
                assert(0 && "unknown device");
                return;
        }


@@ -91,7 +87,7 @@ static struct device *device_handler_find(struct device_handler *handler,
                        && streq(handler->devices[i]->id, id))
                        return handler->devices[i];
 
                        && streq(handler->devices[i]->id, id))
                        return handler->devices[i];
 

-       assert(0 && "unknown device");
+       pb_log("%s: unknown device: %s\n", __func__, id);

        return NULL;
 }
 
        return NULL;
 }
 


@@ -141,7 +137,7 @@ static void setup_device_links(struct discover_context *ctx)
                char *enc, *dir, *path;
                const char *value;
 
                char *enc, *dir, *path;
                const char *value;
 

-               value = udev_event_param(ctx->event, link->env);
+               value = event_get_param(ctx->event, link->env);

                if (!value || !*value)
                        continue;
 
                if (!value || !*value)
                        continue;
 


@@ -200,8 +196,18 @@ static int mount_device(struct discover_context *ctx)
        argv[4] = "ro";
        argv[5] = NULL;
 
        argv[4] = "ro";
        argv[5] = NULL;
 

-       if (pb_run_cmd(argv))
-               goto out_rmdir;
+       if (pb_run_cmd(argv, 1, 0)) {
+
+               /* Retry mount without ro option. */
+
+               argv[0] = MOUNT_BIN;
+               argv[1] = ctx->device_path;
+               argv[2] = ctx->mount_path;
+               argv[3] = NULL;
+
+               if (pb_run_cmd(argv, 1, 0))
+                       goto out_rmdir;
+       }

 
        setup_device_links(ctx);
        return 0;
 
        setup_device_links(ctx);
        return 0;


@@ -266,8 +272,8 @@ static int destroy_context(void *arg)
        return 0;
 }
 
        return 0;
 }
 

-static int handle_add_event(struct device_handler *handler,
-               struct udev_event *event)
+static int handle_add_udev_event(struct device_handler *handler,
+               struct event *event)

 {
        struct discover_context *ctx;
        const char *devname;
 {
        struct discover_context *ctx;
        const char *devname;


@@ -282,12 +288,8 @@ static int handle_add_event(struct device_handler *handler,
 
        ctx->id = talloc_strdup(ctx, event->device);
 
 
        ctx->id = talloc_strdup(ctx, event->device);
 

-       devname = udev_event_param(ctx->event, "DEVNAME");
-       if (!devname) {
-               pb_log("no devname for %s?\n", event->device);
-               return 0;
-       }
-
+       devname = event_get_param(ctx->event, "DEVNAME");
+       assert(devname);

        ctx->device_path = talloc_strdup(ctx, devname);
 
        rc = mount_device(ctx);
        ctx->device_path = talloc_strdup(ctx, devname);
 
        rc = mount_device(ctx);


@@ -315,8 +317,8 @@ static int handle_add_event(struct device_handler *handler,
        return 0;
 }
 
        return 0;
 }
 

-static int handle_remove_event(struct device_handler *handler,
-               struct udev_event *event)
+static int handle_remove_udev_event(struct device_handler *handler,
+               struct event *event)

 {
        struct discover_context *ctx;
 
 {
        struct discover_context *ctx;
 


@@ -334,22 +336,77 @@ static int handle_remove_event(struct device_handler *handler,
        return 0;
 }
 
        return 0;
 }
 

-int device_handler_event(struct device_handler *handler,
-               struct udev_event *event)
+static int handle_add_user_event(struct device_handler *handler,
+               struct event *event)

 {
 {

-       int rc;
+       struct device *device;
+
+       assert(event->device);
+
+       device = talloc_zero(handler, struct device);
+
+       if (!device)
+               goto fail;
+
+       device->id = talloc_strdup(device, event->device);
+       list_init(&device->boot_options);
+
+       parse_user_event(device, event);
+
+       discover_server_notify_add(handler->server, device);
+
+       /* add device to handler device array */
+       device_handler_add(handler, device);
+
+       return 0;
+
+fail:
+       talloc_free(device);
+       return 0;
+}
+
+static int handle_remove_user_event(struct device_handler *handler,
+               struct event *event)
+{
+       struct device *device = device_handler_find(handler, event->device);
+
+       if (!device)
+               return 0;
+
+       discover_server_notify_remove(handler->server, device);
+
+       /* remove device from handler device array */
+       device_handler_remove(handler, device);
+
+       talloc_free(device);
+       return 0;
+}
+
+typedef int (*event_handler)(struct device_handler *, struct event *);

 
 

-       switch (event->action) {
-       case UDEV_ACTION_ADD:
-               rc = handle_add_event(handler, event);
-               break;
+static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
+       [EVENT_TYPE_UDEV] = {
+               [EVENT_ACTION_ADD]      = handle_add_udev_event,
+               [EVENT_ACTION_REMOVE]   = handle_remove_udev_event,
+       },
+       [EVENT_TYPE_USER] = {
+               [EVENT_ACTION_ADD]      = handle_add_user_event,
+               [EVENT_ACTION_REMOVE]   = handle_remove_user_event,
+       }
+};

 
 

-       case UDEV_ACTION_REMOVE:
-               rc = handle_remove_event(handler, event);
-               break;
+int device_handler_event(struct device_handler *handler,
+               struct event *event)
+{
+       if (event->type >= EVENT_TYPE_MAX ||
+                       event->action >= EVENT_ACTION_MAX ||
+                       !handlers[event->type][event->action]) {
+               pb_log("%s unknown type/action: %d/%d\n", __func__,
+                               event->type, event->action);
+               return 0;

        }
 
        }
 

-       return rc;
+       return handlers[event->type][event->action](handler, event);

 }
 
 struct device_handler *device_handler_init(struct discover_server *server)
 }
 
 struct device_handler *device_handler_init(struct discover_server *server)