diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c index 3efd6dfcc..49ffd3103 100644 --- a/kpartx/devmapper.c +++ b/kpartx/devmapper.c @@ -18,6 +18,12 @@ #define MAX_PREFIX_LEN (_UUID_PREFIX_LEN + 4) #define PARAMS_SIZE 1024 +#ifdef LIBDM_API_COOKIE +# define __DM_API_COOKIE_UNUSED__ /* empty */ +#else +# define __DM_API_COOKIE_UNUSED__ __attribute__((unused)) +#endif + int dm_prereq(char * str, uint32_t x, uint32_t y, uint32_t z) { int r = 1; @@ -55,12 +61,12 @@ int dm_prereq(char * str, uint32_t x, uint32_t y, uint32_t z) return r; } -int dm_simplecmd(int task, const char *name, int no_flush, uint16_t udev_flags) +int dm_simplecmd(int task, const char *name, int no_flush, __DM_API_COOKIE_UNUSED__ uint16_t udev_flags) { int r = 0; +#ifdef LIBDM_API_COOKIE int udev_wait_flag = (task == DM_DEVICE_RESUME || task == DM_DEVICE_REMOVE); -#ifdef LIBDM_API_COOKIE uint32_t cookie = 0; #endif struct dm_task *dmt;