shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

log_error() if inotify_add_watch() fails

Browse Source 
[zj: Reworded message s/to watch/to add watch on/ to make it clear
     that it was the watch init action that failed, and not the
     "process of watching". I think this way it'll be clearer to
     people who don't know what inotify does.]
This commit is contained in:
Harald Hoyer 2013-02-13 15:09:36 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent f04e95ba6b
commit 2826d14091
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/login/sd-login.c
View File

@ -733,6 +733,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "seat")) {
k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
log_error("Failed to add watch on /run/systemd/seats/: %m");
close_nointr_nofail(fd);
return -errno;
}
@ -743,6 +744,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "session")) {
k = inotify_add_watch(fd, "/run/systemd/sessions/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
log_error("Failed to add watch on /run/systemd/sessions/: %m");
close_nointr_nofail(fd);
return -errno;
}
@ -753,6 +755,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "uid")) {
k = inotify_add_watch(fd, "/run/systemd/users/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
log_error("Failed to add watch on /run/systemd/users/: %m");
close_nointr_nofail(fd);
return -errno;
}

2
src/readahead/readahead-common.c
View File

@ -227,7 +227,7 @@ int open_inotify(void) {
mkdir("/run/systemd/readahead", 0755);
if (inotify_add_watch(fd, "/run/systemd/readahead", IN_CREATE) < 0) {
log_error("Failed to watch /run/systemd/readahead: %m");
log_error("Failed to add watch on /run/systemd/readahead: %m");
close_nointr_nofail(fd);
return -errno;
}

1
src/shared/ask-password-api.c
View File

@ -78,6 +78,7 @@ int ask_password_tty(
}
if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
log_error("Failed to add watch on %s: %m", flag_file);
r = -errno;
goto finish;
}

1
src/shared/util.c
View File

@ -2220,6 +2220,7 @@ int acquire_terminal(
wd = inotify_add_watch(notify, name, IN_CLOSE);
if (wd < 0) {
r = -errno;
log_error("Failed to add watch on %s: %m", name);
goto fail;
}
}

2
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -81,6 +81,7 @@ static int ask_password_plymouth(
}
if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
log_error("Failed to add watch on %s: %m", flag_file);
r = -errno;
goto finish;
}
@ -577,6 +578,7 @@ static int watch_passwords(void) {
}
if (inotify_add_watch(notify, "/run/systemd/ask-password", IN_CLOSE_WRITE|IN_MOVED_TO) < 0) {
log_error("Failed to add watch on /run/systemd/ask-password: %m");
r = -errno;
goto finish;
}