From: Tom Gundersen <teg@jklm.no>
Date: Fri, 17 Apr 2015 13:46:37 +0000 (+0200)
Subject: udev: event - update tags before writing out db
X-Git-Tag: v220~322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=353f605867f9dac1eea4ad8ebaa92a004cbcd9e7;p=thirdparty%2Fsystemd.git

udev: event - update tags before writing out db

The old tags are read from the db when deciding which tags to clear,
make sure we don't write out the new db before the old one has been
read.
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index bda06385eaa..978b21832d7 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -877,12 +877,11 @@ void udev_event_execute_rules(struct udev_event *event,
                 udev_device_ensure_usec_initialized(event->dev, event->dev_db);
 
                 /* (re)write database file */
-                udev_device_update_db(dev);
                 udev_device_tag_index(dev, event->dev_db, true);
+                udev_device_update_db(dev);
                 udev_device_set_is_initialized(dev);
 
-                udev_device_unref(event->dev_db);
-                event->dev_db = NULL;
+                event->dev_db = udev_device_unref(event->dev_db);
         }
 }