shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

udevd: fix REMOVE handling

Browse Source 
This reverts b67f944. Lazy loading of device properties does not work for devices
that are received over netlink, as these are sealed. Reinstate the unconditional
loading of the device db.

Reported by: Mantas Mikulėnas <grawity@gmail.com>.
This commit is contained in:
Tom Gundersen 2015-04-23 15:19:13 +02:00
parent 353f605867
commit 107f2e2526
7 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsystemd/sd-device/device-internal.h
View File

@ -110,6 +110,7 @@ int device_new_aux(sd_device **ret);
int device_add_property_aux(sd_device *device, const char *key, const char *value, bool db);
int device_add_property_internal(sd_device *device, const char *key, const char *value);
int device_read_uevent_file(sd_device *device);
int device_read_db_aux(sd_device *device, bool force);
int device_set_syspath(sd_device *device, const char *_syspath, bool verify);
int device_set_ifindex(sd_device *device, const char *ifindex);

6
src/libsystemd/sd-device/device-private.c
View File

@ -1100,3 +1100,9 @@ int device_delete_db(sd_device *device) {
return 0;
}
int device_read_db_force(sd_device *device) {
assert(device);
return device_read_db_aux(device, true);
}

1
src/libsystemd/sd-device/device-private.h
View File

@ -61,3 +61,4 @@ int device_new_from_synthetic_event(sd_device **new_device, const char *syspath,
int device_tag_index(sd_device *dev, sd_device *dev_old, bool add);
int device_update_db(sd_device *device);
int device_delete_db(sd_device *device);
int device_read_db_force(sd_device *device);

8
src/libsystemd/sd-device/sd-device.c
View File

@ -1220,7 +1220,7 @@ int device_get_id_filename(sd_device *device, const char **ret) {
return 0;
}
static int device_read_db(sd_device *device) {
int device_read_db_aux(sd_device *device, bool force) {
_cleanup_free_ char *db = NULL;
char *path;
const char *id, *value;
@ -1237,7 +1237,7 @@ static int device_read_db(sd_device *device) {
INVALID_LINE,
} state = PRE_KEY;
if (device->db_loaded || device->sealed)
if (device->db_loaded || (!force && device->sealed))
return 0;
r = device_get_id_filename(device, &id);
@ -1313,6 +1313,10 @@ static int device_read_db(sd_device *device) {
return 0;
}
static int device_read_db(sd_device *device) {
return device_read_db_aux(device, false);
}
_public_ int sd_device_get_is_initialized(sd_device *device, int *initialized) {
int r;

6
src/libudev/libudev-device-private.c
View File

@ -407,3 +407,9 @@ void udev_device_set_info_loaded(struct udev_device *udev_device) {
device_seal(udev_device->device);
}
void udev_device_read_db(struct udev_device *udev_device) {
assert(udev_device);
device_read_db_force(udev_device->device);
}

1
src/libudev/libudev-private.h
View File

@ -67,6 +67,7 @@ int udev_device_get_ifindex(struct udev_device *udev_device);
void udev_device_set_info_loaded(struct udev_device *device);
bool udev_device_get_db_persist(struct udev_device *udev_device);
void udev_device_set_db_persist(struct udev_device *udev_device);
void udev_device_read_db(struct udev_device *udev_device);
/* libudev-device-private.c */
int udev_device_update_db(struct udev_device *udev_device);

7
src/udev/udev-event.c
View File

@ -794,6 +794,10 @@ void udev_event_execute_rules(struct udev_event *event,
return;
if (streq(udev_device_get_action(dev), "remove")) {
udev_device_read_db(dev);
udev_device_tag_index(dev, NULL, false);
udev_device_delete_db(dev);
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
@ -804,9 +808,6 @@ void udev_event_execute_rules(struct udev_event *event,
if (major(udev_device_get_devnum(dev)) != 0)
udev_node_remove(dev);
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
} else {
event->dev_db = udev_device_clone_with_db(dev);
if (event->dev_db != NULL) {