shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

udev: make sd_device_get_devname() failure non-fatal

Browse Source 
As it is just for logging.

Follow-up for eb276e9841.
This commit is contained in:
Yu Watanabe 2018-10-17 04:04:35 +09:00 committed by Lennart Poettering
parent 8aeb1d3176
commit d86c8a6cdb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/udev/udev-watch.c
View File

@ -121,23 +121,22 @@ int udev_watch_begin(sd_device *dev) {
int udev_watch_end(sd_device *dev) {
char filename[STRLEN("/run/udev/watch/") + DECIMAL_STR_MAX(int)];
const char *devnode;
const char *name = NULL;
int wd, r;
if (inotify_fd < 0)
return log_error_errno(EINVAL, "Invalid inotify descriptor.");
r = sd_device_get_devname(dev, &devnode);
if (r < 0)
return log_error_errno(r, "Failed to get device name: %m");
if (sd_device_get_devname(dev, &name) < 0)
(void) sd_device_get_syspath(dev, &name);
r = device_get_watch_handle(dev, &wd);
if (r == -ENOENT)
return 0;
if (r < 0)
return log_error_errno(r, "Failed to get watch handle for device '%s', ignoring: %m", devnode);
return log_error_errno(r, "Failed to get watch handle for device '%s', ignoring: %m", strnull(name));
log_debug("Removing watch on '%s'", devnode);
log_debug("Removing watch on '%s'", strnull(name));
(void) inotify_rm_watch(inotify_fd, wd);
xsprintf(filename, "/run/udev/watch/%d", wd);