Cleanup of previous commit with latest changes in udev support code.

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 4232d557281041c594238d0a6de3f16971116273..ede17b25a17bc736b0047e0cc60d04043df59bdb 100644 (file)
--- 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 94250ddf64fad7de6506c3293c1bb82a00ca8300..0be5bbe9b9f13fe1097918852f98577f02ad0b77 100644 (file)
--- 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"