diff --git a/daemons/dmeventd/libdevmapper-event.h b/daemons/dmeventd/libdevmapper-event.h index e623d2f47..c239060da 100644 --- a/daemons/dmeventd/libdevmapper-event.h +++ b/daemons/dmeventd/libdevmapper-event.h @@ -86,9 +86,9 @@ enum dm_event_type { /* FIXME Replace device with standard name/uuid/devno choice */ /* Interface changes: First register a handler, passing in a unique ref for the device. */ - int dm_event_register_handler(const char *dso_name, const char *device); - int dm_event_register(const char *dso_name, const char *name, const char *uuid, uint32_t major, uint32_t minor, enum dm_event_type events); -Or (better?) add to task structure and use existing functions - run a task to register/unregister events - we may need to run task withe that with the new event mechanism anyway, then the dso calls just hook in. +// int dm_event_register_handler(const char *dso_name, const char *device); +// int dm_event_register(const char *dso_name, const char *name, const char *uuid, uint32_t major, uint32_t minor, enum dm_event_type events); +/* Or (better?) add to task structure and use existing functions - run a task to register/unregister events - we may need to run task withe that with the new event mechanism anyway, then the dso calls just hook in. */ /* FIXME Missing consts? */ diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 0cb0f1f9f..4bf19d935 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -340,9 +340,9 @@ int dm_tree_node_add_mirror_target(struct dm_tree_node *node, int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, uint32_t region_size, unsigned clustered, - uint32_t flags, const char *log_uuid, - unsigned area_count); + unsigned area_count, + uint32_t flags); int dm_tree_node_add_target_area(struct dm_tree_node *node, const char *dev_name, const char *dlid, diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 20164bef6..e25205489 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1662,9 +1662,9 @@ int dm_tree_node_add_striped_target(struct dm_tree_node *node, int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, uint32_t region_size, unsigned clustered, - uint32_t flags, const char *log_uuid, - unsigned area_count) + unsigned area_count, + uint32_t flags) { struct dm_tree_node *log_node = NULL; struct load_segment *seg;