Fix udev support for old libdevmapper with not compatible definition.

Some released devmapper libraries have defined dm_task_set_cookie()
with not compatible parameters (ABI break), let's check for udev support
by using flags definition (udev is for cryptsetup not usable without this anyway).

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@296 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index 0fb7fbd..2ef15be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-07-03  Milan Broz  <mbroz@redhat.com>
+       * Fix udev support for old libdevmapper with not compatible definition.
+
 2010-06-01  Milan Broz  <mbroz@redhat.com>
        * Fix device alignment ioctl calls parameters.
        * Fix activate_by_* API calls to handle NULL device name as documented.

diff --git a/configure.in b/configure.in
index c28d662..b6658bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ else
        DEVMAPPER_LIBS=$LIBS
 fi
 
-AC_CHECK_FUNCS([dm_task_set_cookie], [have_cookie=yes], [have_cookie=no])
+AC_CHECK_DECLS([DM_UDEV_DISABLE_DISK_RULES_FLAG], [have_cookie=yes], [have_cookie=no], [#include <libdevmapper.h>])
 if test "x$enable_udev" = xyes; then
        if test "x$have_cookie" = xno; then
                AC_MSG_WARN([The device-mapper library on your system has no udev support, udev support disabled.])

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index c37a84e..e2379ab 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -26,14 +26,16 @@ static int _dm_use_count = 0;
 static struct crypt_device *_context = NULL;
 
 /* Compatibility for old device-mapper without udev support */
-#ifndef HAVE_DM_TASK_SET_COOKIE
+#ifndef HAVE_DECL_DM_UDEV_DISABLE_DISK_RULES_FLAG
 #define CRYPT_TEMP_UDEV_FLAGS  0
-static int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { return 0; }
-static int dm_udev_wait(uint32_t cookie) { return 0; };
+static int _dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { return 0; }
+static int _dm_udev_wait(uint32_t cookie) { return 0; };
 #else
 #define CRYPT_TEMP_UDEV_FLAGS  DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG | \
                                DM_UDEV_DISABLE_DISK_RULES_FLAG | \
                                DM_UDEV_DISABLE_OTHER_RULES_FLAG
+#define _dm_task_set_cookie    dm_task_set_cookie
+#define _dm_udev_wait          dm_udev_wait
 #endif
 
 static int _dm_use_udev()
@@ -289,13 +291,13 @@ static int _dm_simple(int task, const char *name, int udev_wait)
        if (name && !dm_task_set_name(dmt, name))
                goto out;
 
-       if (udev_wait && !dm_task_set_cookie(dmt, &cookie, 0))
+       if (udev_wait && !_dm_task_set_cookie(dmt, &cookie, 0))
                goto out;
 
        r = dm_task_run(dmt);
 
        if (udev_wait)
-               (void)dm_udev_wait(cookie);
+               (void)_dm_udev_wait(cookie);
 
       out:
        dm_task_destroy(dmt);
@@ -455,7 +457,7 @@ int dm_create_device(const char *name,
                if (!dm_task_set_uuid(dmt, dev_uuid))
                        goto out_no_removal;
 
-               if (_dm_use_udev() && !dm_task_set_cookie(dmt, &cookie, udev_flags))
+               if (_dm_use_udev() && !_dm_task_set_cookie(dmt, &cookie, udev_flags))
                        goto out_no_removal;
        }
 
@@ -481,7 +483,7 @@ int dm_create_device(const char *name,
                        goto out;
                if (uuid && !dm_task_set_uuid(dmt, dev_uuid))
                        goto out;
-               if (_dm_use_udev() && !dm_task_set_cookie(dmt, &cookie, udev_flags))
+               if (_dm_use_udev() && !_dm_task_set_cookie(dmt, &cookie, udev_flags))
                        goto out;
                if (!dm_task_run(dmt))
                        goto out;
@@ -493,7 +495,7 @@ int dm_create_device(const char *name,
        r = 0;
 out:
        if (_dm_use_udev()) {
-               (void)dm_udev_wait(cookie);
+               (void)_dm_udev_wait(cookie);
                cookie = 0;
        }
 
@@ -511,7 +513,7 @@ out:
 
 out_no_removal:
        if (cookie && _dm_use_udev())
-               (void)dm_udev_wait(cookie);
+               (void)_dm_udev_wait(cookie);
 
        if (params)
                safe_free(params);