udev: really exclude device-mapper from block device ownership event locking

[elogind.git] / src / login / user-sessions.c

diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
index 18066ccc39f1c05e2a0498212aec2f73e5e5ec25..ca5de41f40277113244fc118f60e0e703b780999 100644 (file)
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -25,111 +25,9 @@
 
 #include "log.h"
 #include "util.h"
-#include "cgroup-util.h"
 #include "fileio.h"
 
-static int kill_all_users(void) {
-        _cleanup_closedir_ DIR *d = NULL;
-        struct dirent *de;
-        int r = 0;
-
-        d = opendir("/run/systemd/users");
-        if (!d) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_error("Failed to open /run/systemd/users: %m");
-                return -errno;
-        }
-
-        FOREACH_DIRENT(de, d, return -errno) {
-                _cleanup_free_ char *cgroup = NULL;
-                char *a;
-                int k;
-
-                if (!dirent_is_file(de))
-                        continue;
-
-                a = strappenda("/run/systemd/users/", de->d_name);
-
-                k = parse_env_file(a, NEWLINE, "CGROUP", &cgroup, NULL);
-                if (k < 0) {
-                        if (k != -ENOENT) {
-                                log_error("Failed to read user data: %s", strerror(-k));
-                                r = k;
-                        }
-
-                        continue;
-                }
-
-                if (!cgroup) {
-                        log_error("User data did not contain cgroup field.");
-                        r = -ENOENT;
-                        continue;
-                }
-
-                k = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, cgroup, true);
-                if (k < 0) {
-                        log_error("Failed to kill cgroup %s: %s", cgroup, strerror(-k));
-                        r = k;
-                }
-        }
-
-        return r;
-}
-
-static int kill_all_sessions(void) {
-        _cleanup_closedir_ DIR *d = NULL;
-        struct dirent *de;
-        int r = 0;
-
-        d = opendir("/run/systemd/sessions");
-        if (!d) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_error("Failed to open /run/systemd/sessions: %m");
-                return -errno;
-        }
-
-        FOREACH_DIRENT(de, d, return -errno) {
-                _cleanup_free_ char *cgroup = NULL;
-                char *a;
-                int k;
-
-                if (!dirent_is_file(de))
-                        continue;
-
-                a = strappenda("/run/systemd/sessions/", de->d_name);
-
-                k = parse_env_file(a, NEWLINE, "CGROUP", &cgroup, NULL);
-                if (k < 0) {
-                        if (k != -ENOENT) {
-                                log_error("Failed to read session data: %s", strerror(-k));
-                                r = k;
-                        }
-
-                        continue;
-                }
-
-                if (!cgroup) {
-                        log_error("Session data did not contain cgroup field.");
-                        r = -ENOENT;
-                        continue;
-                }
-
-                k = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, cgroup, true);
-                if (k < 0) {
-                        log_error("Failed to kill cgroup %s: %s", cgroup, strerror(-k));
-                        r = k;
-                }
-        }
-
-        return r;
-}
-
 int main(int argc, char*argv[]) {
-        int ret = EXIT_FAILURE;
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
@@ -143,7 +41,7 @@ int main(int argc, char*argv[]) {
         umask(0022);
 
         if (streq(argv[1], "start")) {
-                int q = 0, r = 0;
+                int r = 0;
 
                 if (unlink("/run/nologin") < 0 && errno != ENOENT) {
                         log_error("Failed to remove /run/nologin file: %m");
@@ -151,7 +49,6 @@ int main(int argc, char*argv[]) {
                 }
 
                 if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
-
                         /* If the file doesn't exist and /etc simply
                          * was read-only (in which case unlink()
                          * returns EROFS even if the file doesn't
@@ -159,35 +56,26 @@ int main(int argc, char*argv[]) {
 
                         if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) {
                                 log_error("Failed to remove /etc/nologin file: %m");
-                                q = -errno;
+                                return EXIT_FAILURE;
                         }
                 }
 
-                if (r < 0 || q < 0)
-                        goto finish;
+                if (r < 0)
+                        return EXIT_FAILURE;
 
         } else if (streq(argv[1], "stop")) {
-                int r, q;
+                int r;
 
                 r = write_string_file_atomic("/run/nologin", "System is going down.");
-                if (r < 0)
+                if (r < 0) {
                         log_error("Failed to create /run/nologin: %s", strerror(-r));
-
-                q = kill_all_users();
-                if (q < 0 && r >= 0)
-                        r = q;
-
-                q = kill_all_sessions();
-                if (q < 0 && r >= 0)
-                        r = q;
+                        return EXIT_FAILURE;
+                }
 
         } else {
                 log_error("Unknown verb %s.", argv[1]);
-                goto finish;
+                return EXIT_FAILURE;
         }
 
-        ret = EXIT_SUCCESS;
-
-finish:
-        return ret;
+        return EXIT_SUCCESS;
 }