Merge pull request #1657 from phomes/tmpfiles-simplification

tmpfiles: simplify mountpoint detection
2015-10-24 12:17:41 +02:00
parent 63a94c49dd 2bb158c1ce
commit 48d04f25bf
1 changed files with 1 additions and 2 deletions
@@ -1585,8 +1585,7 @@ static int clean_item_instance(Item *i, const char* instance) {
        if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0)
                return log_error_errno(errno, "stat(%s/..) failed: %m", i->path);

-        mountpoint = s.st_dev != ps.st_dev ||
-                     (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
+        mountpoint = s.st_dev != ps.st_dev || s.st_ino == ps.st_ino;

        log_debug("Cleanup threshold for %s \"%s\" is %s",
                  mountpoint ? "mount point" : "directory",