[systemd-commits] src/udev

Kay Sievers kay at kemper.freedesktop.org
Tue Jun 10 07:09:40 PDT 2014


 src/udev/udevd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 638ca89c53e2b897cfb3f627f4acbc7d09af2f4c
Author: Christian Hesse <mail at eworm.de>
Date:   Tue Jun 10 15:51:15 2014 +0200

    udev: really exclude device-mapper from block device ownership event locking
    
    Arguments were wrong order, no?
    This fixes commits:
    
    e918a1b5a94f270186dca59156354acd2a596494
    3d06f4183470d42361303086ed9dedd29c0ffc1b

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 0f3f3f0..160360e 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -304,7 +304,7 @@ static void worker_new(struct event *event)
                          * <kabi_> IMHO this sounds like a good plan for this moment
                          */
                         if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
-                            !startswith("dm-", udev_device_get_sysname(dev))) {
+                            !startswith(udev_device_get_sysname(dev), "dm-")) {
                                 struct udev_device *d = dev;
 
                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
@@ -741,7 +741,7 @@ static int synthesize_change(struct udev_device *dev) {
 
         if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
             streq_ptr("disk", udev_device_get_devtype(dev)) &&
-            !startswith("dm-", udev_device_get_sysname(dev))) {
+            !startswith(udev_device_get_sysname(dev), "dm-")) {
                 bool part_table_read = false;
                 bool has_partitions = false;
                 int fd;



More information about the systemd-commits mailing list