From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Mar 2011 18:48:12 +0000 (+0100)
Subject: main: minor optimization
X-Git-Tag: v20~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81ab0d3c65206140fffafefa6d14e8494edc44cb;p=systemd

main: minor optimization
---

diff --git a/src/main.c b/src/main.c
index 3291561e..ef6e6817 100644
--- a/src/main.c
+++ b/src/main.c
@@ -941,15 +941,12 @@ static void test_mtab(void) {
 }
 
 static void test_usr(void) {
-        struct stat a, b;
         bool separate = false;
 
         /* Check that /usr is not a separate fs */
 
-        if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0)
-                if (a.st_dev != b.st_dev)
-                        separate = true;
-
+        if (path_is_mount_point("/usr") > 0)
+                separate = true;
         /* This check won't work usually during boot, since /usr is
          * probably not mounted yet, hence let's add a second
          * check. We just check whether /usr is an empty directory. */