chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Support system.conf.d and user.conf.d directories in the usual search paths
[elogind.git]
/
src
/
core
/
automount.c
diff --git
a/src/core/automount.c
b/src/core/automount.c
index f874951f4c6b5c76f9960d8b3624df06d979471f..f7954871318bf44ed6a963d9dd76f086e973c417 100644
(file)
--- a/
src/core/automount.c
+++ b/
src/core/automount.c
@@
-75,7
+75,7
@@
static void repeat_unmount(const char *path) {
continue;
if (errno != EINVAL)
continue;
if (errno != EINVAL)
- log_error
(
"Failed to unmount: %m");
+ log_error
_errno(errno,
"Failed to unmount: %m");
break;
}
break;
}
@@
-300,10
+300,8
@@
static int open_dev_autofs(Manager *m) {
label_fix("/dev/autofs", false, false);
m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY);
label_fix("/dev/autofs", false, false);
m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY);
- if (m->dev_autofs_fd < 0) {
- log_error("Failed to open /dev/autofs: %m");
- return -errno;
- }
+ if (m->dev_autofs_fd < 0)
+ return log_error_errno(errno, "Failed to open /dev/autofs: %m");
init_autofs_dev_ioctl(¶m);
if (ioctl(m->dev_autofs_fd, AUTOFS_DEV_IOCTL_VERSION, ¶m) < 0) {
init_autofs_dev_ioctl(¶m);
if (ioctl(m->dev_autofs_fd, AUTOFS_DEV_IOCTL_VERSION, ¶m) < 0) {
@@
-422,7
+420,7
@@
int automount_send_ready(Automount *a, int status) {
return ioctl_fd;
if (status)
return ioctl_fd;
if (status)
- log_unit_debug
(UNIT(a)->id, "Sending failure: %s", strerror(-status)
);
+ log_unit_debug
_errno(UNIT(a)->id, status, "Sending failure: %m"
);
else
log_unit_debug(UNIT(a)->id, "Sending success.");
else
log_unit_debug(UNIT(a)->id, "Sending success.");
@@
-744,7
+742,10
@@
static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
l = loop_read(a->pipe_fd, &packet, sizeof(packet), true);
if (l != sizeof(packet)) {
l = loop_read(a->pipe_fd, &packet, sizeof(packet), true);
if (l != sizeof(packet)) {
- log_unit_error(UNIT(a)->id, "Invalid read from pipe: %s", l < 0 ? strerror(-l) : "short read");
+ if (l < 0)
+ log_unit_error_errno(UNIT(a)->id, l, "Invalid read from pipe: %m");
+ else
+ log_unit_error(UNIT(a)->id, "Invalid read from pipe: short read");
goto fail;
}
goto fail;
}
@@
-770,7
+771,7
@@
static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
r = set_put(a->tokens, UINT_TO_PTR(packet.v5_packet.wait_queue_token));
if (r < 0) {
r = set_put(a->tokens, UINT_TO_PTR(packet.v5_packet.wait_queue_token));
if (r < 0) {
- log_unit_error
(UNIT(a)->id, "Failed to remember token: %s", strerror(-r)
);
+ log_unit_error
_errno(UNIT(a)->id, r, "Failed to remember token: %m"
);
goto fail;
}
goto fail;
}