[systemd-commits] 10 commits - src/fsckd
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Mar 9 10:47:38 PDT 2015
src/fsckd/fsckd.c | 187 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 111 insertions(+), 76 deletions(-)
New commits:
commit 7046313698e449415ab76c96af4ac0b0fdbf473c
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:45:50 2015 +0100
fsckd: rework plymouth connection management
- the even source should not be freed before the fd for it is closed
- read() returns an ssize_t and we need to handle it as such
- properly handle errors from read()
- reuse on_plymouth_disconnect() whenever we disconnect from plymouth,
and rename it plymouth_disconnect hence()
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 4ff8eea..757b9f1 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -72,7 +72,10 @@ typedef struct Manager {
FILE *console;
double percent;
int numdevices;
+
int plymouth_fd;
+ sd_event_source *plymouth_event_source;
+
bool plymouth_cancel_sent;
bool cancel_requested;
} Manager;
@@ -126,7 +129,10 @@ static void remove_client(Client **first, Client *item) {
free(item);
}
-static void on_plymouth_disconnect(Manager *m) {
+static void plymouth_disconnect(Manager *m) {
+ assert(m);
+
+ m->plymouth_event_source = sd_event_source_unref(m->plymouth_event_source);
m->plymouth_fd = safe_close(m->plymouth_fd);
m->plymouth_cancel_sent = false;
}
@@ -135,24 +141,31 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent
Manager *m = userdata;
Client *current;
char buffer[6];
- int r;
+ ssize_t l;
assert(m);
- r = read(m->plymouth_fd, buffer, sizeof(buffer));
- if (r <= 0)
- on_plymouth_disconnect(m);
- else {
- if (buffer[0] == '\15')
- log_error("Message update to plymouth wasn't delivered successfully");
-
- /* the only answer support type we requested is a key interruption */
- if (buffer[0] == '\2' && buffer[5] == '\3') {
- m->cancel_requested = true;
- /* cancel all connected clients */
- LIST_FOREACH(clients, current, m->clients)
- request_cancel_client(current);
- }
+ l = read(m->plymouth_fd, buffer, sizeof(buffer));
+ if (l < 0) {
+ log_warning_errno(errno, "Got error while reading from plymouth: %m");
+ plymouth_disconnect(m);
+ return -errno;
+ }
+ if (l == 0) {
+ plymouth_disconnect(m);
+ return 0;
+ }
+
+ if (buffer[0] == '\15')
+ log_error("Message update to plymouth wasn't delivered successfully");
+
+ /* the only answer support type we requested is a key interruption */
+ if (buffer[0] == '\2' && buffer[5] == '\3') {
+ m->cancel_requested = true;
+
+ /* cancel all connected clients */
+ LIST_FOREACH(clients, current, m->clients)
+ request_cancel_client(current);
}
return 0;
@@ -276,7 +289,7 @@ static int connect_plymouth(Manager *m) {
goto fail;
}
- r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
+ r = sd_event_add_io(m->event, &m->plymouth_event_source, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
if (r < 0) {
log_warning_errno(r, "Can't listen to plymouth socket: %m");
goto fail;
@@ -285,7 +298,7 @@ static int connect_plymouth(Manager *m) {
return 0;
fail:
- on_plymouth_disconnect(m);
+ plymouth_disconnect(m);
return r;
}
@@ -395,8 +408,10 @@ static void manager_free(Manager *m) {
fflush(m->console);
}
+ plymouth_disconnect(m);
+
safe_close(m->connection_fd);
- safe_close(m->plymouth_fd);
+
if (m->console)
fclose(m->console);
commit e9d2527ff4b9a907cb8a4a035be646d3dd443abc
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:30:37 2015 +0100
fscd: fix error handling
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index ae56fe6..4ff8eea 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -173,25 +173,32 @@ static int send_message_plymouth_socket(int plymouth_fd, const char *message, bo
}
static int send_message_plymouth(Manager *m, const char *message) {
- int r;
const char *plymouth_cancel_message = NULL;
+ int r;
r = connect_plymouth(m);
if (r < 0)
return r;
if (!m->plymouth_cancel_sent) {
- /* indicate to plymouth that we listen to Ctrl+C */
+
+ /* Indicate to plymouth that we listen to Ctrl+C */
r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true);
if (r < 0)
- return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
+ return log_warning_errno(r, "Can't send to plymouth cancel key: %m");
+
m->plymouth_cancel_sent = true;
+
plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
+
r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
if (r < 0)
log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
+
} else if (m->numdevices == 0) {
+
m->plymouth_cancel_sent = false;
+
r = send_message_plymouth_socket(m->plymouth_fd, "", false);
if (r < 0)
log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m");
@@ -199,7 +206,7 @@ static int send_message_plymouth(Manager *m, const char *message) {
r = send_message_plymouth_socket(m->plymouth_fd, message, true);
if (r < 0)
- return log_warning_errno(errno, "Couldn't send \"%s\" to plymouth: %m", message);
+ return log_warning_errno(r, "Couldn't send \"%s\" to plymouth: %m", message);
return 0;
}
commit 3963cea3b0d86e32a32937bee54a3eed713563fd
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:30:18 2015 +0100
fsck: no need for a temporary variable
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 4a61d80..ae56fe6 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -160,7 +160,7 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent
static int send_message_plymouth_socket(int plymouth_fd, const char *message, bool update) {
_cleanup_free_ char *packet = NULL;
- int r, n;
+ int n;
char mode = 'M';
if (update)
@@ -168,10 +168,9 @@ static int send_message_plymouth_socket(int plymouth_fd, const char *message, bo
if (asprintf(&packet, "%c\002%c%s%n", mode, (int) (strlen(message) + 1), message, &n) < 0)
return log_oom();
- r = loop_write(plymouth_fd, packet, n + 1, true);
- return r;
-}
+ return loop_write(plymouth_fd, packet, n + 1, true);
+}
static int send_message_plymouth(Manager *m, const char *message) {
int r;
commit d2268a20a0bf99c5d26bee9048aa48b377c72949
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:29:08 2015 +0100
fsckd: fix error handling when sending cancel request to fsck client
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index cf82332..4a61d80 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -34,16 +34,16 @@
#include <sys/un.h>
#include <unistd.h>
+#include "sd-daemon.h"
#include "build.h"
#include "def.h"
#include "event-util.h"
-#include "fsckd.h"
#include "log.h"
#include "list.h"
#include "macro.h"
-#include "sd-daemon.h"
#include "socket-util.h"
#include "util.h"
+#include "fsckd.h"
#define IDLE_TIME_SECONDS 30
#define PLYMOUTH_REQUEST_KEY "K\2\2\3"
@@ -102,16 +102,21 @@ static double compute_percent(int pass, size_t cur, size_t max) {
}
static int request_cancel_client(Client *current) {
- FsckdMessage cancel_msg;
+ FsckdMessage cancel_msg = {
+ .cancel = 1,
+ };
+
ssize_t n;
- cancel_msg.cancel = 1;
n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
- if (n < 0 || (size_t) n < sizeof(FsckdMessage))
- return log_warning_errno(n, "Cannot send cancel to fsck on (%u, %u): %m",
- major(current->devnum), minor(current->devnum));
- else
- current->cancelled = true;
+ if (n < 0)
+ return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+ if ((size_t) n < sizeof(FsckdMessage)) {
+ log_warning("Short send when sending cancel to fsck on (%u:%u).", major(current->devnum), minor(current->devnum));
+ return -EIO;
+ }
+
+ current->cancelled = true;
return 0;
}
commit 705778ad6a0d1fd62bdb81fad0074199a3e25666
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:21:34 2015 +0100
fsck: unify exit path for connect_plymouth()
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 3abf962..cf82332 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -227,6 +227,7 @@ static int update_global_progress(Manager *m) {
"Checking in progress on %d disks (%3.1f%% complete)", m->numdevices),
m->numdevices, m->percent) < 0)
return -ENOMEM;
+
if (asprintf(&fsck_message, "fsckd:%d:%3.1f:%s", m->numdevices, m->percent, console_message) < 0)
return -ENOMEM;
@@ -260,17 +261,21 @@ static int connect_plymouth(Manager *m) {
return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
- on_plymouth_disconnect(m);
- return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+ r = log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+ goto fail;
}
r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
if (r < 0) {
- on_plymouth_disconnect(m);
- return log_warning_errno(r, "Can't listen to plymouth socket: %m");
+ log_warning_errno(r, "Can't listen to plymouth socket: %m");
+ goto fail;
}
return 0;
+
+fail:
+ on_plymouth_disconnect(m);
+ return r;
}
static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
commit a922c18bce8d25f23c3614d3508f80658958a285
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:19:56 2015 +0100
fsck: use only a single exit code ternary operator
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 0f64746..3abf962 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -516,41 +516,43 @@ int main(int argc, char *argv[]) {
r = parse_argv(argc, argv);
if (r <= 0)
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ goto finish;
n = sd_listen_fds(0);
if (n > 1) {
log_error("Too many file descriptors received.");
- return EXIT_FAILURE;
+ r = -EINVAL;
+ goto finish;
} else if (n == 1)
fd = SD_LISTEN_FDS_START + 0;
else {
fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
if (fd < 0) {
- log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
- return EXIT_FAILURE;
+ r = log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
+ goto finish;
}
}
r = manager_new(&m, fd);
if (r < 0) {
log_error_errno(r, "Failed to allocate manager: %m");
- return EXIT_FAILURE;
+ goto finish;
}
r = sd_event_add_io(m->event, NULL, fd, EPOLLIN, new_connection_handler, m);
if (r < 0) {
log_error_errno(r, "Can't listen to connection socket: %m");
- return EXIT_FAILURE;
+ goto finish;
}
r = run_event_loop_with_timeout(m->event, IDLE_TIME_SECONDS * USEC_PER_SEC);
if (r < 0) {
log_error_errno(r, "Failed to run event loop: %m");
- return EXIT_FAILURE;
+ goto finish;
}
sd_event_get_exit_code(m->event, &r);
+finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
commit 76bb3afd811ea33fcd20b278fe04ff0a7be203fd
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:19:23 2015 +0100
fsck: simplification
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index d4e9896..0f64746 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -252,20 +252,22 @@ static int connect_plymouth(Manager *m) {
int r;
/* try to connect or reconnect if sending a message */
- if (m->plymouth_fd <= 0) {
- m->plymouth_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
- if (m->plymouth_fd < 0) {
- return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
- }
- if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
- on_plymouth_disconnect(m);
- return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
- }
- r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
- if (r < 0) {
- on_plymouth_disconnect(m);
- return log_warning_errno(r, "Can't listen to plymouth socket: %m");
- }
+ if (m->plymouth_fd >= 0)
+ return 0;
+
+ m->plymouth_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
+ if (m->plymouth_fd < 0)
+ return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
+
+ if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
+ on_plymouth_disconnect(m);
+ return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+ }
+
+ r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
+ if (r < 0) {
+ on_plymouth_disconnect(m);
+ return log_warning_errno(r, "Can't listen to plymouth socket: %m");
}
return 0;
commit adfe5671ef794099068038dfccbf1eb5134433c8
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:16:54 2015 +0100
fsckd: the error code is actually returned in 'fd'
Also, we don't use {} for single-line if-blocks.
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index df413fb..d4e9896 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -520,12 +520,12 @@ int main(int argc, char *argv[]) {
if (n > 1) {
log_error("Too many file descriptors received.");
return EXIT_FAILURE;
- } else if (n == 1) {
+ } else if (n == 1)
fd = SD_LISTEN_FDS_START + 0;
- } else {
+ else {
fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
if (fd < 0) {
- log_error_errno(r, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
+ log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
return EXIT_FAILURE;
}
}
commit 2de68ed95d6e460658946416210df6528dbf1a0d
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:16:36 2015 +0100
fsckd: simplify code a bit
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 9522fd7..df413fb 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -338,25 +338,26 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents,
/* Initialize and list new clients */
new_client_fd = accept4(m->connection_fd, NULL, NULL, SOCK_CLOEXEC);
- if (new_client_fd > 0) {
- log_debug("New fsck client connected to fd: %d", new_client_fd);
- client = new0(Client, 1);
- if (!client)
- return log_oom();
- client->fd = new_client_fd;
- client->manager = m;
- LIST_PREPEND(clients, m->clients, client);
- r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
- if (r < 0) {
- remove_client(&(m->clients), client);
- return r;
- }
- /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
- if (m->cancel_requested)
- request_cancel_client(client);
- } else
+ if (new_client_fd < 0)
return log_error_errno(errno, "Couldn't accept a new connection: %m");
+ log_debug("New fsck client connected to fd: %d", new_client_fd);
+
+ client = new0(Client, 1);
+ if (!client)
+ return log_oom();
+ client->fd = new_client_fd;
+ client->manager = m;
+ LIST_PREPEND(clients, m->clients, client);
+ r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
+ if (r < 0) {
+ remove_client(&(m->clients), client);
+ return r;
+ }
+ /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
+ if (m->cancel_requested)
+ request_cancel_client(client);
+
return 0;
}
commit c011cc26696b18e5696e262063905d16369f74b3
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:16:20 2015 +0100
fsckd: make use of safe_close()'s return value
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 834476c..9522fd7 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -122,8 +122,7 @@ static void remove_client(Client **first, Client *item) {
}
static void on_plymouth_disconnect(Manager *m) {
- safe_close(m->plymouth_fd);
- m->plymouth_fd = -1;
+ m->plymouth_fd = safe_close(m->plymouth_fd);
m->plymouth_cancel_sent = false;
}
More information about the systemd-commits
mailing list