chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: simplify mount_needs_network check
[elogind.git]
/
src
/
core
/
path.c
diff --git
a/src/core/path.c
b/src/core/path.c
index 93c51bb3bec5b0363003c7624e077f252bfd9b4a..3624bfcac7f771365e0a113786d3c6f540b1ae88 100644
(file)
--- a/
src/core/path.c
+++ b/
src/core/path.c
@@
-99,7
+99,8
@@
int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
break;
}
break;
}
- log_warning("Failed to add watch on %s: %m", s->path);
+ log_warning("Failed to add watch on %s: %s", s->path,
+ errno == ENOSPC ? "too many watches" : strerror(-r));
r = -errno;
if (cut)
*cut = tmp;
r = -errno;
if (cut)
*cut = tmp;
@@
-135,7
+136,7
@@
int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
}
if (!exists) {
}
if (!exists) {
- log_error
(
"Failed to add watch on any of the components of %s: %m",
+ log_error
_errno(errno,
"Failed to add watch on any of the components of %s: %m",
s->path);
r = -errno; /* either EACCESS or ENOENT */
goto fail;
s->path);
r = -errno; /* either EACCESS or ENOENT */
goto fail;
@@
-152,11
+153,7
@@
void path_spec_unwatch(PathSpec *s) {
assert(s);
s->event_source = sd_event_source_unref(s->event_source);
assert(s);
s->event_source = sd_event_source_unref(s->event_source);
-
- if (s->inotify_fd >= 0) {
- close_nointr_nofail(s->inotify_fd);
- s->inotify_fd = -1;
- }
+ s->inotify_fd = safe_close(s->inotify_fd);
}
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
}
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
@@
-171,10
+168,8
@@
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
return -EINVAL;
}
return -EINVAL;
}
- if (ioctl(s->inotify_fd, FIONREAD, &l) < 0) {
- log_error("FIONREAD failed: %m");
- return -errno;
- }
+ if (ioctl(s->inotify_fd, FIONREAD, &l) < 0)
+ return log_error_errno(errno, "FIONREAD failed: %m");
assert(l > 0);
assert(l > 0);
@@
-183,10
+178,8
@@
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
return log_oom();
k = read(s->inotify_fd, buf, l);
return log_oom();
k = read(s->inotify_fd, buf, l);
- if (k < 0) {
- log_error("Failed to read inotify event: %m");
- return -errno;
- }
+ if (k < 0)
+ return log_error_errno(errno, "Failed to read inotify event: %m");
e = (struct inotify_event*) buf;
e = (struct inotify_event*) buf;
@@
-253,7
+246,7
@@
static void path_spec_mkdir(PathSpec *s, mode_t mode) {
r = mkdir_p_label(s->path, mode);
if (r < 0)
r = mkdir_p_label(s->path, mode);
if (r < 0)
- log_warning
("mkdir(%s) failed: %s", s->path, strerror(-r)
);
+ log_warning
_errno(r, "mkdir(%s) failed: %m", s->path
);
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
@@
-323,7
+316,7
@@
static int path_verify(Path *p) {
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
- log_
error_unit
(UNIT(p)->id,
+ log_
unit_error
(UNIT(p)->id,
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
@@
-565,8
+558,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
- UNIT(p)->id, strerror(-r));
+ log_warning_errno(r, "%s failed to enter waiting state: %m", UNIT(p)->id);
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
@@
-727,7
+719,7
@@
static void path_trigger_notify(Unit *u, Unit *other) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
- log_
debug_unit
(UNIT(p)->id,
+ log_
unit_debug
(UNIT(p)->id,
"%s got notified about unit deactivation.",
UNIT(p)->id);
"%s got notified about unit deactivation.",
UNIT(p)->id);