[systemd-commits] src/core

[Lennart Poettering]

 src/core/mount.c |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit dd144c63e285e35149f80b1a41af548ad040c037
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 24 12:48:46 2012 +0200

    mount: simplify device node conditions a bit

diff --git a/src/core/mount.c b/src/core/mount.c
index db793f2..3e40e3f 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -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;