1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00

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

This commit is contained in:
Peter Rajnoha 2009-10-26 21:38:35 +00:00
parent 963cf98df1
commit 10fffe842b
2 changed files with 3 additions and 2 deletions

View File

@ -1158,7 +1158,8 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags)
goto bad; 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; dmt->cookie_set = 1;
log_debug("Udev cookie 0x%" PRIx32 " (semid %d) assigned to dm_task " log_debug("Udev cookie 0x%" PRIx32 " (semid %d) assigned to dm_task "

View File

@ -6,7 +6,7 @@
# suspended. # suspended.
# "add" event is processed on coldplug only! # "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_RULES_VSN}!="?*", GOTO="dm_other"
ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_other" ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_other"