From 01dc83b936156f0b7d13a48ff96ccb9ba38031c1 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 15 Jan 2007 19:47:49 +0000 Subject: [PATCH] fix recent checkins --- daemons/dmeventd/dmeventd.c | 2 +- daemons/dmeventd/libdevmapper-event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 320aa1408..d227c2f9b 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/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/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 7bf76dabe..3d2568aa3 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/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; }