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: drop UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT and UNIT_DEPENDENCY_MOUNTINFO_DEFAULT

Browse Source 
They're not used anymore.
This commit is contained in:
Franck Bui 2022-09-12 17:50:51 +02:00
parent c5d82021ba
commit 9c77ffc7e0
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/mount.c
View File

@ -611,11 +611,10 @@ static int mount_add_non_exec_dependencies(Mount *m) {
assert(m);
/* Any dependencies based on /proc/self/mountinfo may be now stale. */
unit_remove_dependencies(UNIT(m),
UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT |
UNIT_DEPENDENCY_MOUNTINFO_DEFAULT |
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE);
/* 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
* 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);
if (!m->where)
return 0;

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

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

15
src/core/unit.h
View File

@ -79,24 +79,17 @@ typedef enum UnitDependencyMask {
/* A dependency created because of some unit's RequiresMountsFor= setting */
UNIT_DEPENDENCY_PATH = 1 << 4,
/* A dependency created because of data read from /proc/self/mountinfo and no other configuration source */
UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT = 1 << 5,
/* A dependency created because of data read from /proc/self/mountinfo, but conditionalized by
* DefaultDependencies= and thus also involving configuration from UNIT_DEPENDENCY_FILE sources */
UNIT_DEPENDENCY_MOUNTINFO_DEFAULT = 1 << 6,
/* A dependency created because of data read from /proc/self/mountinfo, but fallback to unit configuration
* sources */
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE = 1 << 7,
UNIT_DEPENDENCY_MOUNTINFO_OR_FILE = 1 << 5,
/* A dependency created because of data read from /proc/swaps and no other configuration source */
UNIT_DEPENDENCY_PROC_SWAP = 1 << 8,
UNIT_DEPENDENCY_PROC_SWAP = 1 << 6,
/* A dependency for units in slices assigned by directly setting Slice= */
UNIT_DEPENDENCY_SLICE_PROPERTY = 1 << 9,
UNIT_DEPENDENCY_SLICE_PROPERTY = 1 << 7,
_UNIT_DEPENDENCY_MASK_FULL = (1 << 10) - 1,
_UNIT_DEPENDENCY_MASK_FULL = (1 << 8) - 1,
} UnitDependencyMask;
/* The Unit's dependencies[] hashmaps use this structure as value. It has the same size as a void pointer, and thus can