core: simplify things a bit by checking default_dependencies boolean in callee, not caller

It's nicer to hide the check away in the various
xyz_add_default_dependencies() calls, rather than making it explicit in
the caller, and thus require deeper nesing.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/core/mount.c b/src/core/mount.c
index d3766ba934..49525ebb78 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -393,6 +393,9 @@ static int mount_add_default_dependencies(Mount *m) {
 
         assert(m);
 
+        if (!UNIT(m)->default_dependencies)
+                return 0;
+
         if (UNIT(m)->manager->running_as != MANAGER_SYSTEM)
                 return 0;
 
@@ -533,11 +536,9 @@ static int mount_add_extras(Mount *m) {
         if (r < 0)
                 return r;
 
-        if (u->default_dependencies) {
-                r = mount_add_default_dependencies(m);
-                if (r < 0)
-                        return r;
-        }
+        r = mount_add_default_dependencies(m);
+        if (r < 0)
+                return r;
 
         return 0;
 }