clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-07 14:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

libudev: introduce clone_with_db()

Browse Source 
This allows us to move the db reading from udevd to libudev.
This commit is contained in:
Tom Gundersen
2015-03-12 12:03:50 +01:00
parent a4445e88ce
commit 8f0f13f045
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libudev/libudev-device.c
+14
View File
@@ -1986,6 +1986,20 @@ struct udev_device *udev_device_shallow_clone(struct udev_device *old_device)
return device;
}
struct udev_device *udev_device_clone_with_db(struct udev_device *old_device)
{
struct udev_device *device;
device = udev_device_shallow_clone(old_device);
if (!device)
return NULL;
udev_device_read_db(device);
udev_device_set_info_loaded(device);
return device;
}
struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr, ssize_t buflen) {
struct udev_device *device;
ssize_t bufpos = 0;
src/libudev/libudev-private.h
+1
View File
@@ -39,6 +39,7 @@ int udev_get_rules_path(struct udev *udev, char **path[], usec_t *ts_usec[]);
/* libudev-device.c */
struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr, ssize_t buflen);
struct udev_device *udev_device_shallow_clone(struct udev_device *old_device);
struct udev_device *udev_device_clone_with_db(struct udev_device *old_device);
int udev_device_copy_properties(struct udev_device *dst, struct udev_device *src);
mode_t udev_device_get_devnode_mode(struct udev_device *udev_device);
uid_t udev_device_get_devnode_uid(struct udev_device *udev_device);
src/udev/udev-event.c
+1 -4
View File
@@ -807,11 +807,8 @@ void udev_event_execute_rules(struct udev_event *event,
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
} else {
event->dev_db = udev_device_shallow_clone(dev);
event->dev_db = udev_device_clone_with_db(dev);
if (event->dev_db != NULL) {
udev_device_read_db(event->dev_db);
udev_device_set_info_loaded(event->dev_db);
/* disable watch during event processing */
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, event->dev_db);