From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 23 Mar 2024 09:37:36 +0000 (+0800)
Subject: core: introduce UNIT_IS_LOAD_ERROR helper
X-Git-Tag: v256-rc1~428^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4c5871631737c2f8b0ea4eed1909753dd47c0a;p=thirdparty%2Fsystemd.git

core: introduce UNIT_IS_LOAD_ERROR helper
---

diff --git a/src/core/mount.c b/src/core/mount.c
index f574e28ec47..175af5498af 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1778,7 +1778,7 @@ static int mount_setup_existing_unit(
 
         m->from_proc_self_mountinfo = true;
 
-        if (IN_SET(u->load_state, UNIT_NOT_FOUND, UNIT_BAD_SETTING, UNIT_ERROR)) {
+        if (UNIT_IS_LOAD_ERROR(u->load_state)) {
                 /* The unit was previously not found or otherwise not loaded. Now that the unit shows up in
                  * /proc/self/mountinfo we should reconsider it this, hence set it to UNIT_LOADED. */
                 u->load_state = UNIT_LOADED;
diff --git a/src/core/swap.c b/src/core/swap.c
index 655f932f95a..9e200086f37 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -422,7 +422,7 @@ static int swap_setup_unit(
 
         /* The unit is definitely around now, mark it as loaded if it was previously referenced but
          * could not be loaded. After all we can load it now, from the data in /proc/swaps. */
-        if (IN_SET(u->load_state, UNIT_NOT_FOUND, UNIT_BAD_SETTING, UNIT_ERROR)) {
+        if (UNIT_IS_LOAD_ERROR(u->load_state)) {
                 u->load_state = UNIT_LOADED;
                 u->load_error = 0;
         }
diff --git a/src/core/unit.h b/src/core/unit.h
index 7134d362fe1..0cfd90b3d4c 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -67,6 +67,10 @@ static inline bool UNIT_IS_LOAD_COMPLETE(UnitLoadState t) {
         return t >= 0 && t < _UNIT_LOAD_STATE_MAX && t != UNIT_STUB && t != UNIT_MERGED;
 }
 
+static inline bool UNIT_IS_LOAD_ERROR(UnitLoadState t) {
+        return IN_SET(t, UNIT_NOT_FOUND, UNIT_BAD_SETTING, UNIT_ERROR);
+}
+
 /* Stores the 'reason' a dependency was created as a bit mask, i.e. due to which configuration source it came to be. We
  * use this so that we can selectively flush out parts of dependencies again. Note that the same dependency might be
  * created as a result of multiple "reasons", hence the bitmask. */