chiark / gitweb /
mount: simplify device node conditions a bit
authorLennart Poettering <lennart@poettering.net>
Mon, 24 Sep 2012 10:48:46 +0000 (12:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 24 Sep 2012 10:48:46 +0000 (12:48 +0200)
src/core/mount.c

index db793f2..3e40e3f 100644 (file)
@@ -352,18 +352,20 @@ static int mount_add_device_links(Mount *m) {
         if (!p->what)
                 return 0;
 
-        if (!mount_is_bind(p) &&
-            !path_equal(m->where, "/") &&
-            is_device_path(p->what)) {
-                r = unit_add_node_link(UNIT(m), p->what, false);
-                if (r < 0)
-                        return r;
-        }
+        if (mount_is_bind(p))
+                return 0;
+
+        if (!is_device_path(p->what))
+                return 0;
+
+        if (path_equal(m->where, "/"))
+                return 0;
+
+        r = unit_add_node_link(UNIT(m), p->what, false);
+        if (r < 0)
+                return r;
 
         if (p->passno > 0 &&
-            !mount_is_bind(p) &&
-            !path_equal(m->where, "/") &&
-            is_device_path(p->what) &&
             UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
                 char *name;
                 Unit *fsck;