From 10fffe842b6c395a3deaabb569c85298fd9a4929 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Mon, 26 Oct 2009 21:38:35 +0000 Subject: [PATCH] Cleanup of previous commit with latest changes in udev support code. --- libdm/libdm-common.c | 3 ++- udev/13-dm-disk.rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 4232d5572..ede17b25a 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1158,7 +1158,8 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) goto bad; } - dmt->event_nr = (0x0000FFFF & *cookie) | (flags << 16); + dmt->event_nr = (~DM_UDEV_FLAGS_MASK & *cookie) | + (flags << DM_UDEV_FLAGS_SHIFT); dmt->cookie_set = 1; log_debug("Udev cookie 0x%" PRIx32 " (semid %d) assigned to dm_task " diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules index 94250ddf6..0be5bbe9b 100644 --- a/udev/13-dm-disk.rules +++ b/udev/13-dm-disk.rules @@ -6,7 +6,7 @@ # suspended. # "add" event is processed on coldplug only! -ACTION!="add|change", GOTO="dm_end" +ACTION!="add|change", GOTO="dm_other" ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_other" ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_other" -- 2.43.5