summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-24 12:17:41 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-24 12:17:41 +0200
commit48d04f25bf400fe0ff612a23bb4785bb245b6139 (patch)
tree0782fdebe5d2691b22c953873f2320ec27de4842 /src
parent63a94c49ddee0447374013758252a9a6b30c3f7a (diff)
parent2bb158c1ce914632aa3d19baef33877d58ba1e40 (diff)
Merge pull request #1657 from phomes/tmpfiles-simplification
tmpfiles: simplify mountpoint detection
Diffstat (limited to 'src')
-rw-r--r--src/tmpfiles/tmpfiles.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index f636a4d33b..09b6ca5c2c 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -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",