From 7c626d5c9ac0fb55b2179c0fb5f386c8dceadded Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 18 Mar 2011 13:21:02 +0000 Subject: [PATCH] Improve debug stack trace dm_check_version reports log_error() - so use return_NULL. --- WHATS_NEW_DM | 1 + libdm/ioctl/libdm-iface.c | 4 +++- libdm/libdm-common.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 5c7906609..6072bd030 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.64 - =================================== + Improve stack debug reporting in dm_task_create(). Fallback to control node creation only if node doesn't exist yet. Change dm_hash API for binary data to accept const void *key. Fix memory access of empty params string in _reload_with_suppression_v4(). diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index b52c9254b..bf07a44eb 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -965,8 +965,10 @@ int dm_check_version(void) if (_check_version(dmversion, sizeof(dmversion), _dm_compat)) return 1; - if (!_dm_compat) + if (!_dm_compat) { + log_error("Support for older device-mapped version is disabled."); goto bad; + } log_verbose("device-mapper ioctl protocol version %u failed. " "Trying protocol version 1.", _dm_version); diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 56b913765..c5780e7c6 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -183,7 +183,7 @@ struct dm_task *dm_task_create(int type) if (!dm_check_version()) { dm_free(dmt); - return NULL; + return_NULL; } dmt->type = type;