fix recent checkins

diff --git a/dmeventd/dmeventd.c b/dmeventd/dmeventd.c
index 320aa1408133a23096a596122999afe35eaa04b2..d227c2f9b7f27b3ea28bbbc69bec89e40c16f99c 100644 (file)
--- a/dmeventd/dmeventd.c
+++ b/dmeventd/dmeventd.c
@@ -855,7 +855,7 @@ static int _register_for_event(struct message_data *message_data)
           events. However, if timeout thread cannot be started, it
           usually means we are so starved on resources that we are
           almost as good as dead already... */
-       if (thread->events & DM_EVENT_TIMEOUT) {
+       if (thread_new->events & DM_EVENT_TIMEOUT) {
                ret = -_register_for_timeout(thread);
                 if (ret) {
                     _unlock_mutex();

diff --git a/dmeventd/libdevmapper-event.c b/dmeventd/libdevmapper-event.c
index 7bf76dabe692d06d618ed37d6791b500a01a42ca..3d2568aa3468c17f168ac2d9d7f72b63ffc521ca 100644 (file)
--- a/dmeventd/libdevmapper-event.c
+++ b/dmeventd/libdevmapper-event.c
@@ -426,6 +426,7 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
        else if (dmevh->major && dmevh->minor) {
                dm_task_set_major(dmt, dmevh->major);
                dm_task_set_minor(dmt, dmevh->minor);
+        }
 
        /* FIXME Add name or uuid or devno to messages */
        if (!dm_task_run(dmt)) {
@@ -433,7 +434,7 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
                goto failed;
        }
 
-       if (!dm_task_get_info(dmt, &info))
+       if (!dm_task_get_info(dmt, &info)) {
                log_error("_get_device_info: failed to get info for device");
                goto failed;
        }