summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2015-10-23 20:15:17 +0200
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>2015-10-23 22:35:03 +0200
commit2bb158c1ce914632aa3d19baef33877d58ba1e40 (patch)
treebe0d00ebbd05ba62fa52c04bb269a86aeef45509
parent931c7feac07aa0f8c1be02b4f746a568c9cae883 (diff)
tmpfiles: simplify mountpoint detection
No functional change. Just a simplification. A || (!A && B) is the same as A || B Introduced in 78a92a5a2306709e4587e332728a76901323ade9
-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",