if (path_equal(a->where, m->where))
return 0;
- if ((r = unit_add_two_dependencies(UNIT(a), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
+ r = unit_add_two_dependencies(UNIT(a), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true);
+ if (r < 0)
return r;
return 0;
assert(a);
- LIST_FOREACH(units_by_type, other, UNIT(a)->manager->units_by_type[UNIT_MOUNT])
- if ((r = automount_add_one_mount_link(a, MOUNT(other))) < 0)
+ LIST_FOREACH(units_by_type, other, UNIT(a)->manager->units_by_type[UNIT_MOUNT]) {
+ r = automount_add_one_mount_link(a, MOUNT(other));
+ if (r < 0)
return r;
+ }
return 0;
}
assert(a);
- if (UNIT(a)->manager->running_as == MANAGER_SYSTEM) {
-
- if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
- return r;
+ if (UNIT(a)->manager->running_as != SYSTEMD_SYSTEM)
+ return 0;
- if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
- return r;
- }
+ r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
+ if (r < 0)
+ return r;
return 0;
}
return -EINVAL;
}
- if (!(e = unit_name_from_path(a->where, ".automount")))
+ e = unit_name_from_path(a->where, ".automount");
+ if (!e)
return -ENOMEM;
b = unit_has_name(UNIT(a), e);
assert(u->load_state == UNIT_STUB);
/* Load a .automount file */
- if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
+ r = unit_load_fragment_and_dropin_optional(u);
+ if (r < 0)
return r;
if (u->load_state == UNIT_LOADED) {
Unit *x;
- if (!a->where)
- if (!(a->where = unit_name_to_path(u->id)))
+ if (!a->where) {
+ a->where = unit_name_to_path(u->id);
+ if (!a->where)
return -ENOMEM;
+ }
path_kill_slashes(a->where);
- if ((r = automount_add_mount_links(a)) < 0)
+ r = automount_add_mount_links(a);
+ if (r < 0)
return r;
r = unit_load_related_unit(u, ".mount", &x);
if (r < 0)
return r;
- if (UNIT(a)->default_dependencies)
- if ((r = automount_add_default_dependencies(a)) < 0)
+ if (UNIT(a)->default_dependencies) {
+ r = automount_add_default_dependencies(a);
+ if (r < 0)
return r;
+ }
}
return automount_verify(a);
if (a->deserialized_state != a->state) {
- if ((r = open_dev_autofs(u->manager)) < 0)
+ r = open_dev_autofs(u->manager);
+ if (r < 0)
return r;
if (a->deserialized_state == AUTOMOUNT_WAITING ||
assert(a->pipe_fd >= 0);
- if ((r = unit_watch_fd(UNIT(a), a->pipe_fd, EPOLLIN, &a->pipe_watch)) < 0)
+ r = unit_watch_fd(UNIT(a), a->pipe_fd, EPOLLIN, &a->pipe_watch);
+ if (r < 0)
return r;
}
if (m->dev_autofs_fd >= 0)
return m->dev_autofs_fd;
- label_fix("/dev/autofs", false);
+ label_fix("/dev/autofs", false, false);
- if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
+ m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY);
+ if (m->dev_autofs_fd < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
return -errno;
}
static int open_ioctl_fd(int dev_autofs_fd, const char *where, dev_t devid) {
struct autofs_dev_ioctl *param;
size_t l;
- int r;
assert(dev_autofs_fd >= 0);
assert(where);
l = sizeof(struct autofs_dev_ioctl) + strlen(where) + 1;
-
- if (!(param = malloc(l)))
- return -ENOMEM;
+ param = alloca(l);
init_autofs_dev_ioctl(param);
param->size = l;
param->openmount.devid = devid;
strcpy(param->path, where);
- if (ioctl(dev_autofs_fd, AUTOFS_DEV_IOCTL_OPENMOUNT, param) < 0) {
- r = -errno;
- goto finish;
- }
+ if (ioctl(dev_autofs_fd, AUTOFS_DEV_IOCTL_OPENMOUNT, param) < 0)
+ return -errno;
- if (param->ioctlfd < 0) {
- r = -EIO;
- goto finish;
- }
+ if (param->ioctlfd < 0)
+ return -EIO;
fd_cloexec(param->ioctlfd, true);
- r = param->ioctlfd;
-
-finish:
- free(param);
- return r;
+ return param->ioctlfd;
}
static int autofs_protocol(int dev_autofs_fd, int ioctl_fd) {
if (set_isempty(a->tokens))
return 0;
- if ((ioctl_fd = open_ioctl_fd(UNIT(a)->manager->dev_autofs_fd, a->where, a->dev_id)) < 0) {
+ ioctl_fd = open_ioctl_fd(UNIT(a)->manager->dev_autofs_fd, a->where, a->dev_id);
+ if (ioctl_fd < 0) {
r = ioctl_fd;
goto fail;
}
* if you pass a positive status code here, the kernel will
* freeze! Yay! */
- if ((k = autofs_send_ready(UNIT(a)->manager->dev_autofs_fd,
- ioctl_fd,
- token,
- status)) < 0)
+ k = autofs_send_ready(UNIT(a)->manager->dev_autofs_fd,
+ ioctl_fd,
+ token,
+ status);
+ if (k < 0)
r = k;
}
if (a->tokens)
set_clear(a->tokens);
- if ((dev_autofs_fd = open_dev_autofs(UNIT(a)->manager)) < 0) {
+ dev_autofs_fd = open_dev_autofs(UNIT(a)->manager);
+ if (dev_autofs_fd < 0) {
r = dev_autofs_fd;
goto fail;
}
/* We knowingly ignore the results of this call */
- mkdir_p(a->where, 0555);
+ mkdir_p_label(a->where, 0555);
+
+ if (dir_is_empty(a->where) <= 0)
+ log_notice("%s: Directory %s to mount over is not empty, mounting anyway. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", a->meta.id, a->where);
if (pipe2(p, O_NONBLOCK|O_CLOEXEC) < 0) {
r = -errno;
goto fail;
}
- if ((ioctl_fd = open_ioctl_fd(dev_autofs_fd, a->where, st.st_dev)) < 0) {
+ ioctl_fd = open_ioctl_fd(dev_autofs_fd, a->where, st.st_dev);
+ if (ioctl_fd < 0) {
r = ioctl_fd;
goto fail;
}
- if ((r = autofs_protocol(dev_autofs_fd, ioctl_fd)) < 0)
+ r = autofs_protocol(dev_autofs_fd, ioctl_fd);
+ if (r < 0)
goto fail;
- if ((r = autofs_set_timeout(dev_autofs_fd, ioctl_fd, 300)) < 0)
+ r = autofs_set_timeout(dev_autofs_fd, ioctl_fd, 300);
+ if (r < 0)
goto fail;
/* Autofs fun fact:
close_nointr_nofail(ioctl_fd);
ioctl_fd = -1;
- if ((r = unit_watch_fd(UNIT(a), p[0], EPOLLIN, &a->pipe_watch)) < 0)
+ r = unit_watch_fd(UNIT(a), p[0], EPOLLIN, &a->pipe_watch);
+ if (r < 0)
goto fail;
a->pipe_fd = p[0];
return;
}
- mkdir_p(a->where, a->directory_mode);
+ mkdir_p_label(a->where, a->directory_mode);
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
Automount *a = AUTOMOUNT(u);
assert(a);
-
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
if (path_is_mount_point(a->where, false)) {
Automount *a = AUTOMOUNT(u);
assert(a);
-
assert(a->state == AUTOMOUNT_WAITING || a->state == AUTOMOUNT_RUNNING);
automount_enter_dead(a, AUTOMOUNT_SUCCESS);
if (a->pipe_fd >= 0) {
int copy;
- if ((copy = fdset_put_dup(fds, a->pipe_fd)) < 0)
+ copy = fdset_put_dup(fds, a->pipe_fd);
+ if (copy < 0)
return copy;
unit_serialize_item_format(u, f, "pipe-fd", "%i", copy);
if (streq(key, "state")) {
AutomountState state;
- if ((state = automount_state_from_string(value)) < 0)
+ state = automount_state_from_string(value);
+ if (state < 0)
log_debug("Failed to parse state value %s", value);
else
a->deserialized_state = state;
if (!(a->tokens = set_new(trivial_hash_func, trivial_compare_func)))
return -ENOMEM;
- if ((r = set_put(a->tokens, UINT_TO_PTR(token))) < 0)
+ r = set_put(a->tokens, UINT_TO_PTR(token));
+ if (r < 0)
return r;
}
} else if (streq(key, "pipe-fd")) {
goto fail;
}
- if ((l = loop_read(a->pipe_fd, &packet, sizeof(packet), true)) != sizeof(packet)) {
+ l = loop_read(a->pipe_fd, &packet, sizeof(packet), true);
+ if (l != sizeof(packet)) {
log_error("Invalid read from pipe: %s", l < 0 ? strerror(-l) : "short read");
goto fail;
}
char *p = NULL;
get_process_comm(packet.v5_packet.pid, &p);
- log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
+ log_debug("Got direct mount request on %s, triggered by %lu (%s)",
+ a->where, (unsigned long) packet.v5_packet.pid, strna(p));
free(p);
} else
- log_debug("Got direct mount request for %s", packet.v5_packet.name);
+ log_debug("Got direct mount request on %s", a->where);
- if (!a->tokens)
- if (!(a->tokens = set_new(trivial_hash_func, trivial_compare_func))) {
- log_error("Failed to allocate token set.");
- goto fail;
- }
+ r = set_ensure_allocated(&a->tokens, trivial_hash_func, trivial_compare_func);
+ if (r < 0) {
+ log_error("Failed to allocate token set.");
+ goto fail;
+ }
- if ((r = set_put(a->tokens, UINT_TO_PTR(packet.v5_packet.wait_queue_token))) < 0) {
+ r = set_put(a->tokens, UINT_TO_PTR(packet.v5_packet.wait_queue_token));
+ if (r < 0) {
log_error("Failed to remember token: %s", strerror(-r));
goto fail;
}
DEFINE_STRING_TABLE_LOOKUP(automount_result, AutomountResult);
const UnitVTable automount_vtable = {
- .suffix = ".automount",
.object_size = sizeof(Automount),
.sections =
"Unit\0"
.bus_message_handler = bus_automount_message_handler,
.bus_invalidating_properties = bus_automount_invalidating_properties,
- .shutdown = automount_shutdown
+ .shutdown = automount_shutdown,
+
+ .status_message_formats = {
+ .finished_start_job = {
+ [JOB_DONE] = "Set up automount %s.",
+ [JOB_FAILED] = "Failed to set up automount %s.",
+ [JOB_DEPENDENCY] = "Dependency failed for %s.",
+ },
+ .finished_stop_job = {
+ [JOB_DONE] = "Unset automount %s.",
+ [JOB_FAILED] = "Failed to unset automount %s.",
+ },
+ },
};
~ianmdlvl / elogind.git / blobdiff