[systemd-commits] src/login src/readahead src/shared src/tty-ask-password-agent

[Lennart Poettering]

 src/login/sd-login.c                                |    3 ---
 src/readahead/readahead-common.c                    |    2 +-
 src/shared/ask-password-api.c                       |    1 -
 src/shared/util.c                                   |    1 -
 src/tty-ask-password-agent/tty-ask-password-agent.c |    2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 092c4c437f30bb030deae89cc81109a624898b36
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 13 16:25:33 2013 +0100

    Revert "log_error() if inotify_add_watch() fails"
    
    This reverts commit 2826d14091e43ed3397d862dee79d09d0115c84e.
    
    We never should generate log messages from a library.

diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index 865527f..b81dddf 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -733,7 +733,6 @@ _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;
                 }
@@ -744,7 +743,6 @@ _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;
                 }
@@ -755,7 +753,6 @@ _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;
                 }
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
index 1599ac1..41aaff0 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -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 add watch on /run/systemd/readahead: %m");
+                log_error("Failed to watch /run/systemd/readahead: %m");
                 close_nointr_nofail(fd);
                 return -errno;
         }
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 10e6ae0..8a0fb89 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -78,7 +78,6 @@ 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;
                 }
diff --git a/src/shared/util.c b/src/shared/util.c
index 6ef1914..d754c83 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2220,7 +2220,6 @@ 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;
                 }
         }
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 276ccf9..99a626c 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -81,7 +81,6 @@ 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;
                 }
@@ -578,7 +577,6 @@ 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;
         }