shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

mount: replace UNIT_DEPENDENCY_MOUNTINFO_OR_FILE with UNIT_DEPENDENCY_MOUNTINFO/UNIT_DEPENDENCY_MOUNT_FILE

Browse Source 
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE was a bit strange as unlike the other flags
we don't know where the dependency came from exactly. Indeed its origin could
have been from the mount unit file or from /proc/self/mountinfo.

Instead this patch replaces UNIT_DEPENDENCY_MOUNTINFO_OR_FILE with 2 new
dependency flags: UNIT_DEPENDENCY_MOUNT_FILE and UNIT_DEPENDENCY_MOUNTINFO. The
former indicates that the dep is created from the unit file but unlike
UNIT_DEPENDENCY_FILE, it will be replaced by a dep with the
UNIT_DEPENDENCY_MOUNTINFO flag as soon as the kernel will make the mount
available in /proc/self/mountinfo.
This commit is contained in:
Franck Bui 2022-09-12 17:54:22 +02:00
parent 9c77ffc7e0
commit 87c734eedd
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/mount.c
View File

@ -350,6 +350,7 @@ static int mount_add_mount_dependencies(Mount *m) {
} }
static int mount_add_device_dependencies(Mount *m) { static int mount_add_device_dependencies(Mount *m) {
UnitDependencyMask mask;
MountParameters *p; MountParameters *p;
UnitDependency dep; UnitDependency dep;
int r; int r;
@ -398,14 +399,17 @@ static int mount_add_device_dependencies(Mount *m) {
* suddenly. */ * suddenly. */
dep = mount_is_bound_to_device(m) ? UNIT_BINDS_TO : UNIT_REQUIRES; dep = mount_is_bound_to_device(m) ? UNIT_BINDS_TO : UNIT_REQUIRES;
r = unit_add_node_dependency(UNIT(m), p->what, dep, UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); /* We always use 'what' from /proc/self/mountinfo if mounted */
mask = m->from_proc_self_mountinfo ? UNIT_DEPENDENCY_MOUNTINFO : UNIT_DEPENDENCY_MOUNT_FILE;
r = unit_add_node_dependency(UNIT(m), p->what, dep, mask);
if (r < 0) if (r < 0)
return r; return r;
if (r > 0) if (r > 0)
log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(dep), p->what); log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(dep), p->what);
if (mount_propagate_stop(m)) { if (mount_propagate_stop(m)) {
r = unit_add_node_dependency(UNIT(m), p->what, UNIT_STOP_PROPAGATED_FROM, UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); r = unit_add_node_dependency(UNIT(m), p->what, UNIT_STOP_PROPAGATED_FROM, mask);
if (r < 0) if (r < 0)
return r; return r;
if (r > 0) if (r > 0)
@ -413,7 +417,7 @@ static int mount_add_device_dependencies(Mount *m) {
unit_dependency_to_string(UNIT_STOP_PROPAGATED_FROM), p->what); unit_dependency_to_string(UNIT_STOP_PROPAGATED_FROM), p->what);
} }
r = unit_add_blockdev_dependency(UNIT(m), p->what, UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); r = unit_add_blockdev_dependency(UNIT(m), p->what, mask);
if (r > 0) if (r > 0)
log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(UNIT_AFTER), p->what); log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(UNIT_AFTER), p->what);
@ -470,10 +474,7 @@ static bool mount_is_extrinsic(Unit *u) {
return false; return false;
} }
static int mount_add_default_ordering_dependencies( static int mount_add_default_ordering_dependencies(Mount *m, MountParameters *p, UnitDependencyMask mask) {
Mount *m,
MountParameters *p) {
const char *after, *before, *e; const char *after, *before, *e;
int r; int r;
@ -498,25 +499,23 @@ static int mount_add_default_ordering_dependencies(
} }
if (!mount_is_nofail(m)) { if (!mount_is_nofail(m)) {
r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, before, true, r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, before, /* add_reference= */ true, mask);
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE);
if (r < 0) if (r < 0)
return r; return r;
} }
if (after) { if (after) {
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, true, r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, /* add_reference= */ true, mask);
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE);
if (r < 0) if (r < 0)
return r; return r;
} }
return unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, return unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET,
SPECIAL_UMOUNT_TARGET, true, /* add_reference= */ true, mask);
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE);
} }
static int mount_add_default_dependencies(Mount *m) { static int mount_add_default_dependencies(Mount *m) {
UnitDependencyMask mask;
MountParameters *p; MountParameters *p;
int r; int r;
@ -536,7 +535,9 @@ static int mount_add_default_dependencies(Mount *m) {
if (!p) if (!p)
return 0; return 0;
r = mount_add_default_ordering_dependencies(m, p); mask = m->from_proc_self_mountinfo ? UNIT_DEPENDENCY_MOUNTINFO : UNIT_DEPENDENCY_MOUNT_FILE;
r = mount_add_default_ordering_dependencies(m, p, mask);
if (r < 0) if (r < 0)
return r; return r;
@ -546,8 +547,8 @@ static int mount_add_default_dependencies(Mount *m) {
* network.target, so that they are shut down only after this mount unit is * network.target, so that they are shut down only after this mount unit is
* stopped. */ * stopped. */
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_NETWORK_TARGET, true, r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_NETWORK_TARGET,
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); /* add_reference= */ true, mask);
if (r < 0) if (r < 0)
return r; return r;
@ -556,17 +557,16 @@ static int mount_add_default_dependencies(Mount *m) {
* mounting network file systems, and whose purpose it is to delay this until the * mounting network file systems, and whose purpose it is to delay this until the
* network is "up". */ * network is "up". */
r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_WANTS, UNIT_AFTER, r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_WANTS, UNIT_AFTER, SPECIAL_NETWORK_ONLINE_TARGET,
SPECIAL_NETWORK_ONLINE_TARGET, true, /* add_reference= */ true, mask);
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE);
if (r < 0) if (r < 0)
return r; return r;
} }
/* If this is a tmpfs mount then we have to unmount it before we try to deactivate swaps */ /* If this is a tmpfs mount then we have to unmount it before we try to deactivate swaps */
if (streq_ptr(p->fstype, "tmpfs")) { if (streq_ptr(p->fstype, "tmpfs")) {
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SWAP_TARGET, true, r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SWAP_TARGET,
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); /* add_reference= */ true, mask);
if (r < 0) if (r < 0)
return r; return r;
} }
@ -614,7 +614,7 @@ static int mount_add_non_exec_dependencies(Mount *m) {
/* We may be called due to this mount appearing in /proc/self/mountinfo, hence we clear all existing /* We may be called due to this mount appearing in /proc/self/mountinfo, hence we clear all existing
* dependencies that were initialized from the unit file but whose final value really depends on the * dependencies that were initialized from the unit file but whose final value really depends on the
* content of /proc/self/mountinfo. Some (such as m->where) might have become stale now. */ * content of /proc/self/mountinfo. Some (such as m->where) might have become stale now. */
unit_remove_dependencies(UNIT(m), UNIT_DEPENDENCY_MOUNTINFO_OR_FILE); unit_remove_dependencies(UNIT(m), UNIT_DEPENDENCY_MOUNTINFO | UNIT_DEPENDENCY_MOUNT_FILE);
if (!m->where) if (!m->where)
return 0; return 0;

3
src/core/unit-serialize.c
View File

@ -590,7 +590,8 @@ static void print_unit_dependency_mask(FILE *f, const char *kind, UnitDependency
{ UNIT_DEPENDENCY_DEFAULT, "default" }, { UNIT_DEPENDENCY_DEFAULT, "default" },
{ UNIT_DEPENDENCY_UDEV, "udev" }, { UNIT_DEPENDENCY_UDEV, "udev" },
{ UNIT_DEPENDENCY_PATH, "path" }, { UNIT_DEPENDENCY_PATH, "path" },
{ UNIT_DEPENDENCY_MOUNTINFO_OR_FILE, "mountinfo-or-file" }, { UNIT_DEPENDENCY_MOUNT_FILE, "mount-file" },
{ UNIT_DEPENDENCY_MOUNTINFO, "mountinfo" },
{ UNIT_DEPENDENCY_PROC_SWAP, "proc-swap" }, { UNIT_DEPENDENCY_PROC_SWAP, "proc-swap" },
{ UNIT_DEPENDENCY_SLICE_PROPERTY, "slice-property" }, { UNIT_DEPENDENCY_SLICE_PROPERTY, "slice-property" },
}; };

16
src/core/unit.h
View File

@ -79,17 +79,21 @@ typedef enum UnitDependencyMask {
/* A dependency created because of some unit's RequiresMountsFor= setting */ /* A dependency created because of some unit's RequiresMountsFor= setting */
UNIT_DEPENDENCY_PATH = 1 << 4, UNIT_DEPENDENCY_PATH = 1 << 4,
/* A dependency created because of data read from /proc/self/mountinfo, but fallback to unit configuration /* A dependency initially configured from the mount unit file however the dependency will be updated
* sources */ * from /proc/self/mountinfo as soon as the kernel will make the entry for that mount available in
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE = 1 << 5, * the /proc file */
UNIT_DEPENDENCY_MOUNT_FILE = 1 << 5,
/* A dependency created or updated because of data read from /proc/self/mountinfo */
UNIT_DEPENDENCY_MOUNTINFO = 1 << 6,
/* A dependency created because of data read from /proc/swaps and no other configuration source */ /* A dependency created because of data read from /proc/swaps and no other configuration source */
UNIT_DEPENDENCY_PROC_SWAP = 1 << 6, UNIT_DEPENDENCY_PROC_SWAP = 1 << 7,
/* A dependency for units in slices assigned by directly setting Slice= */ /* A dependency for units in slices assigned by directly setting Slice= */
UNIT_DEPENDENCY_SLICE_PROPERTY = 1 << 7, UNIT_DEPENDENCY_SLICE_PROPERTY = 1 << 8,
_UNIT_DEPENDENCY_MASK_FULL = (1 << 8) - 1, _UNIT_DEPENDENCY_MASK_FULL = (1 << 9) - 1,
} UnitDependencyMask; } UnitDependencyMask;
/* The Unit's dependencies[] hashmaps use this structure as value. It has the same size as a void pointer, and thus can /* The Unit's dependencies[] hashmaps use this structure as value. It has the same size as a void pointer, and thus can