swap: introduce helper variable

[elogind.git] / src / core / swap.c

diff --git a/src/core/swap.c b/src/core/swap.c
index 41ece2708f009a3b52d061ee76e45595659d0161..7e1d4371c685045b228fadd689a45b9254cf23ea 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -55,6 +55,7 @@ static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
 
 static void swap_unset_proc_swaps(Swap *s) {
         Swap *first;
+        Hashmap *swaps;
 
         assert(s);
 
@@ -63,14 +64,17 @@ static void swap_unset_proc_swaps(Swap *s) {
 
         /* Remove this unit from the chain of swaps which share the
          * same kernel swap device. */
-
-        first = hashmap_get(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+        swaps = UNIT(s)->manager->swaps_by_proc_swaps;
+        first = hashmap_get(swaps, s->parameters_proc_swaps.what);
         LIST_REMOVE(Swap, same_proc_swaps, first, s);
 
         if (first)
-                hashmap_remove_and_replace(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what, first->parameters_proc_swaps.what, first);
+                hashmap_remove_and_replace(swaps,
+                                           s->parameters_proc_swaps.what,
+                                           first->parameters_proc_swaps.what,
+                                           first);
         else
-                hashmap_remove(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+                hashmap_remove(swaps, s->parameters_proc_swaps.what);
 
         free(s->parameters_proc_swaps.what);
         s->parameters_proc_swaps.what = NULL;
@@ -165,21 +169,6 @@ static int swap_add_mount_links(Swap *s) {
         return 0;
 }
 
-static int swap_add_target_links(Swap *s) {
-        Unit *tu;
-        int r;
-
-        assert(s);
-
-        if (!s->from_fragment)
-                return 0;
-
-        if ((r = manager_load_unit(UNIT(s)->manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
-                return r;
-
-        return unit_add_dependency(UNIT(s), UNIT_BEFORE, tu, true);
-}
-
 static int swap_add_device_links(Swap *s) {
         SwapParameters *p;
 
@@ -196,7 +185,7 @@ static int swap_add_device_links(Swap *s) {
         if (is_device_path(s->what))
                 return unit_add_node_link(UNIT(s), s->what,
                                           !p->noauto && p->nofail &&
-                                          UNIT(s)->manager->running_as == MANAGER_SYSTEM);
+                                          UNIT(s)->manager->running_as == SYSTEMD_SYSTEM);
         else
                 /* File based swap devices need to be ordered after
                  * systemd-remount-fs.service, since they might need a
@@ -209,7 +198,10 @@ static int swap_add_default_dependencies(Swap *s) {
 
         assert(s);
 
-        if (UNIT(s)->manager->running_as != MANAGER_SYSTEM)
+        if (UNIT(s)->manager->running_as != SYSTEMD_SYSTEM)
+                return 0;
+
+        if (detect_container(NULL) > 0)
                 return 0;
 
         r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
@@ -287,9 +279,6 @@ static int swap_load(Unit *u) {
                 if ((r = swap_add_mount_links(s)) < 0)
                         return r;
 
-                if ((r = swap_add_target_links(s)) < 0)
-                        return r;
-
                 if ((r = unit_add_default_cgroups(u)) < 0)
                         return r;
 
@@ -1351,6 +1340,8 @@ DEFINE_STRING_TABLE_LOOKUP(swap_result, SwapResult);
 
 const UnitVTable swap_vtable = {
         .object_size = sizeof(Swap),
+        .exec_context_offset = offsetof(Swap, exec_context),
+
         .sections =
                 "Unit\0"
                 "Swap\0"