daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
dd65c9
From f3d485e1034cdea60cab3c257e340dd9b3e48fc1 Mon Sep 17 00:00:00 2001
dd65c9
From: Lukas Nykryn <lnykryn@redhat.com>
dd65c9
Date: Mon, 18 Sep 2017 10:13:05 +0200
dd65c9
Subject: [PATCH] Revert "path-util: make use of "mnt_id" field exported in
dd65c9
 /proc/self/fdinfo/<fd>"
dd65c9
dd65c9
This reverts commit f63b66b6347a8d8e5e6930a939d1997bfd8e2e7c.
dd65c9
This implementation was not working becuase of misbehaving
dd65c9
canonicalize_file_name.
dd65c9
dd65c9
Related: #1472439
dd65c9
---
dd65c9
 src/core/automount.c                        |   2 +-
dd65c9
 src/core/machine-id-setup.c                 |   2 +-
dd65c9
 src/core/mount-setup.c                      |   2 +-
dd65c9
 src/efi-boot-generator/efi-boot-generator.c |   2 +-
dd65c9
 src/gpt-auto-generator/gpt-auto-generator.c |   2 +-
dd65c9
 src/login/logind-user.c                     |   2 +-
dd65c9
 src/nspawn/nspawn.c                         |  10 +-
dd65c9
 src/shared/cgroup-util.c                    |   2 +-
dd65c9
 src/shared/condition.c                      |   2 +-
23b3cf
 src/shared/path-util.c                      | 209 +++++---------------
dd65c9
 src/shared/path-util.h                      |   3 +-
23b3cf
 src/test/test-path-util.c                   |  66 +------
dd65c9
 12 files changed, 62 insertions(+), 242 deletions(-)
dd65c9
dd65c9
diff --git a/src/core/automount.c b/src/core/automount.c
c62b8e
index eedd9b8243..4e066613d7 100644
dd65c9
--- a/src/core/automount.c
dd65c9
+++ b/src/core/automount.c
dd65c9
@@ -749,7 +749,7 @@ static int automount_start(Unit *u) {
dd65c9
         assert(a);
dd65c9
         assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
dd65c9
 
dd65c9
-        if (path_is_mount_point(a->where, 0)) {
dd65c9
+        if (path_is_mount_point(a->where, false)) {
dd65c9
                 log_unit_error(u->id,
dd65c9
                                "Path %s is already a mount point, refusing start for %s",
dd65c9
                                a->where, u->id);
dd65c9
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
c62b8e
index 1121d373fa..d00a53246f 100644
dd65c9
--- a/src/core/machine-id-setup.c
dd65c9
+++ b/src/core/machine-id-setup.c
dd65c9
@@ -203,7 +203,7 @@ int machine_id_commit(const char *root) {
dd65c9
                 etc_machine_id = path_kill_slashes(x);
dd65c9
         }
dd65c9
 
dd65c9
-        r = path_is_mount_point(etc_machine_id, 0);
dd65c9
+        r = path_is_mount_point(etc_machine_id, false);
dd65c9
         if (r < 0)
dd65c9
                 return log_error_errno(r, "Failed to determine whether %s is a mount point: %m", etc_machine_id);
dd65c9
         if (r == 0) {
dd65c9
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
c62b8e
index 2b8fbab1a3..521545e5ce 100644
dd65c9
--- a/src/core/mount-setup.c
dd65c9
+++ b/src/core/mount-setup.c
dd65c9
@@ -160,7 +160,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
dd65c9
         if (relabel)
dd65c9
                 label_fix(p->where, true, true);
dd65c9
 
dd65c9
-        r = path_is_mount_point(p->where, AT_SYMLINK_FOLLOW);
dd65c9
+        r = path_is_mount_point(p->where, true);
dd65c9
         if (r < 0)
dd65c9
                 return r;
dd65c9
 
dd65c9
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
c62b8e
index 5492b19946..b3ff3a8b78 100644
dd65c9
--- a/src/efi-boot-generator/efi-boot-generator.c
dd65c9
+++ b/src/efi-boot-generator/efi-boot-generator.c
dd65c9
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
dd65c9
                 return EXIT_SUCCESS;
dd65c9
         }
dd65c9
 
dd65c9
-        if (path_is_mount_point("/boot", AT_SYMLINK_FOLLOW) <= 0 &&
dd65c9
+        if (path_is_mount_point("/boot", true) <= 0 &&
dd65c9
             dir_is_empty("/boot") <= 0) {
dd65c9
                 log_debug("/boot already populated, exiting.");
dd65c9
                 return EXIT_SUCCESS;
dd65c9
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
c62b8e
index d7b047118d..00a2141a58 100644
dd65c9
--- a/src/gpt-auto-generator/gpt-auto-generator.c
dd65c9
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
dd65c9
@@ -299,7 +299,7 @@ static int probe_and_add_mount(
dd65c9
         assert(where);
dd65c9
         assert(description);
dd65c9
 
dd65c9
-        if (path_is_mount_point(where, AT_SYMLINK_FOLLOW) <= 0 &&
dd65c9
+        if (path_is_mount_point(where, true) <= 0 &&
dd65c9
             dir_is_empty(where) <= 0) {
dd65c9
                 log_debug("%s already populated, ignoring.", where);
dd65c9
                 return 0;
dd65c9
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
c62b8e
index 912c50ebde..4298704cea 100644
dd65c9
--- a/src/login/logind-user.c
dd65c9
+++ b/src/login/logind-user.c
dd65c9
@@ -320,7 +320,7 @@ static int user_mkdir_runtime_path(User *u) {
dd65c9
         } else
dd65c9
                 p = u->runtime_path;
dd65c9
 
dd65c9
-        if (path_is_mount_point(p, 0) <= 0) {
dd65c9
+        if (path_is_mount_point(p, false) <= 0) {
dd65c9
                 _cleanup_free_ char *t = NULL;
dd65c9
 
dd65c9
                 (void) mkdir(p, 0700);
dd65c9
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
c62b8e
index a90a3a5d75..ea365b3f9b 100644
dd65c9
--- a/src/nspawn/nspawn.c
dd65c9
+++ b/src/nspawn/nspawn.c
dd65c9
@@ -863,7 +863,7 @@ static int mount_all(const char *dest) {
dd65c9
                 if (!where)
dd65c9
                         return log_oom();
dd65c9
 
dd65c9
-                t = path_is_mount_point(where, AT_SYMLINK_FOLLOW);
dd65c9
+                t = path_is_mount_point(where, true);
dd65c9
                 if (t < 0) {
dd65c9
                         log_error_errno(t, "Failed to detect whether %s is a mount point: %m", where);
dd65c9
 
dd65c9
@@ -989,7 +989,7 @@ static int mount_cgroup_hierarchy(const char *dest, const char *controller, cons
dd65c9
 
dd65c9
         to = strjoina(dest, "/sys/fs/cgroup/", hierarchy);
dd65c9
 
dd65c9
-        r = path_is_mount_point(to, 0);
dd65c9
+        r = path_is_mount_point(to, false);
dd65c9
         if (r < 0)
dd65c9
                 return log_error_errno(r, "Failed to determine if %s is mounted already: %m", to);
dd65c9
         if (r > 0)
dd65c9
@@ -1787,7 +1787,7 @@ static int setup_journal(const char *directory) {
dd65c9
         if (!p || !q)
dd65c9
                 return log_oom();
dd65c9
 
dd65c9
-        if (path_is_mount_point(p, 0) > 0) {
dd65c9
+        if (path_is_mount_point(p, false) > 0) {
dd65c9
                 if (arg_link_journal != LINK_AUTO) {
dd65c9
                         log_error("%s: already a mount point, refusing to use for journal", p);
dd65c9
                         return -EEXIST;
dd65c9
@@ -1796,7 +1796,7 @@ static int setup_journal(const char *directory) {
dd65c9
                 return 0;
dd65c9
         }
dd65c9
 
dd65c9
-        if (path_is_mount_point(q, 0) > 0) {
dd65c9
+        if (path_is_mount_point(q, false) > 0) {
dd65c9
                 if (arg_link_journal != LINK_AUTO) {
dd65c9
                         log_error("%s: already a mount point, refusing to use for journal", q);
dd65c9
                         return -EEXIST;
dd65c9
@@ -3665,7 +3665,7 @@ int main(int argc, char *argv[]) {
dd65c9
                          * the specified is not a mount point we
dd65c9
                          * create the new snapshot in the parent
dd65c9
                          * directory, just next to it. */
dd65c9
-                        r = path_is_mount_point(arg_directory, 0);
dd65c9
+                        r = path_is_mount_point(arg_directory, false);
dd65c9
                         if (r < 0) {
dd65c9
                                 log_error_errno(r, "Failed to determine whether directory %s is mount point: %m", arg_directory);
dd65c9
                                 goto finish;
dd65c9
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
c62b8e
index cf085cb5ff..c5d9e4bb58 100644
dd65c9
--- a/src/shared/cgroup-util.c
dd65c9
+++ b/src/shared/cgroup-util.c
dd65c9
@@ -488,7 +488,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
dd65c9
         if (_unlikely_(!good)) {
dd65c9
                 int r;
dd65c9
 
dd65c9
-                r = path_is_mount_point("/sys/fs/cgroup", 0);
dd65c9
+                r = path_is_mount_point("/sys/fs/cgroup", false);
dd65c9
                 if (r <= 0)
dd65c9
                         return r < 0 ? r : -ENOENT;
dd65c9
 
dd65c9
diff --git a/src/shared/condition.c b/src/shared/condition.c
c62b8e
index 0d2cd2bc3a..796cc520d7 100644
dd65c9
--- a/src/shared/condition.c
dd65c9
+++ b/src/shared/condition.c
dd65c9
@@ -350,7 +350,7 @@ static int condition_test_path_is_mount_point(Condition *c) {
dd65c9
         assert(c->parameter);
dd65c9
         assert(c->type == CONDITION_PATH_IS_MOUNT_POINT);
dd65c9
 
dd65c9
-        return path_is_mount_point(c->parameter, AT_SYMLINK_FOLLOW) > 0;
dd65c9
+        return path_is_mount_point(c->parameter, true) > 0;
dd65c9
 }
dd65c9
 
dd65c9
 static int condition_test_path_is_read_write(Condition *c) {
dd65c9
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
c62b8e
index 0f252ec262..1181ffb9d4 100644
dd65c9
--- a/src/shared/path-util.c
dd65c9
+++ b/src/shared/path-util.c
dd65c9
@@ -36,7 +36,6 @@
dd65c9
 #include "strv.h"
dd65c9
 #include "path-util.h"
dd65c9
 #include "missing.h"
dd65c9
-#include "fileio.h"
dd65c9
 
dd65c9
 bool path_is_absolute(const char *p) {
dd65c9
         return p[0] == '/';
dd65c9
@@ -474,203 +473,87 @@ char* path_join(const char *root, const char *path, const char *rest) {
dd65c9
                                NULL);
dd65c9
 }
dd65c9
 
dd65c9
-static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id) {
dd65c9
-        char path[strlen("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)];
dd65c9
-        _cleanup_free_ char *fdinfo = NULL;
dd65c9
-        _cleanup_close_ int subfd = -1;
dd65c9
-        char *p;
dd65c9
-        int r;
dd65c9
-
dd65c9
-        if ((flags & AT_EMPTY_PATH) && isempty(filename))
dd65c9
-                xsprintf(path, "/proc/self/fdinfo/%i", fd);
dd65c9
-        else {
dd65c9
-                subfd = openat(fd, filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH);
dd65c9
-                if (subfd < 0)
dd65c9
-                        return -errno;
dd65c9
-
dd65c9
-                xsprintf(path, "/proc/self/fdinfo/%i", subfd);
dd65c9
-        }
dd65c9
-
dd65c9
-        r = read_full_file(path, &fdinfo, NULL);
dd65c9
-        if (r == -ENOENT) /* The fdinfo directory is a relatively new addition */
dd65c9
-                return -EOPNOTSUPP;
dd65c9
-        if (r < 0)
dd65c9
-                return -errno;
dd65c9
-
dd65c9
-        p = startswith(fdinfo, "mnt_id:");
dd65c9
-        if (!p) {
dd65c9
-                p = strstr(fdinfo, "\nmnt_id:");
dd65c9
-                if (!p) /* The mnt_id field is a relatively new addition */
dd65c9
-                        return -EOPNOTSUPP;
dd65c9
-
dd65c9
-                p += 8;
dd65c9
-        }
dd65c9
+int path_is_mount_point(const char *t, bool allow_symlink) {
dd65c9
 
dd65c9
-        p += strspn(p, WHITESPACE);
dd65c9
-        p[strcspn(p, WHITESPACE)] = 0;
dd65c9
-
dd65c9
-        return safe_atoi(p, mnt_id);
dd65c9
-}
dd65c9
-
dd65c9
-int fd_is_mount_point(int fd, const char *filename, int flags) {
dd65c9
-        union file_handle_union h = FILE_HANDLE_INIT, h_parent = FILE_HANDLE_INIT;
dd65c9
+        union file_handle_union h = FILE_HANDLE_INIT;
dd65c9
         int mount_id = -1, mount_id_parent = -1;
dd65c9
-        bool nosupp = false, check_st_dev = true;
dd65c9
+        _cleanup_free_ char *parent = NULL;
dd65c9
         struct stat a, b;
dd65c9
         int r;
dd65c9
+        bool nosupp = false;
dd65c9
 
dd65c9
-        assert(fd >= 0);
dd65c9
-        assert(filename);
dd65c9
+        /* We are not actually interested in the file handles, but
dd65c9
+         * name_to_handle_at() also passes us the mount ID, hence use
dd65c9
+         * it but throw the handle away */
dd65c9
 
dd65c9
-        /* First we will try the name_to_handle_at() syscall, which
dd65c9
-         * tells us the mount id and an opaque file "handle". It is
dd65c9
-         * not supported everywhere though (kernel compile-time
dd65c9
-         * option, not all file systems are hooked up). If it works
dd65c9
-         * the mount id is usually good enough to tell us whether
dd65c9
-         * something is a mount point.
dd65c9
-         *
dd65c9
-         * If that didn't work we will try to read the mount id from
dd65c9
-         * /proc/self/fdinfo/<fd>. This is almost as good as
dd65c9
-         * name_to_handle_at(), however, does not return the
dd65c9
-         * opaque file handle. The opaque file handle is pretty useful
dd65c9
-         * to detect the root directory, which we should always
dd65c9
-         * consider a mount point. Hence we use this only as
dd65c9
-         * fallback. Exporting the mnt_id in fdinfo is a pretty recent
dd65c9
-         * kernel addition.
dd65c9
-         *
dd65c9
-         * As last fallback we do traditional fstat() based st_dev
dd65c9
-         * comparisons. This is how things were traditionally done,
dd65c9
-         * but unionfs breaks breaks this since it exposes file
dd65c9
-         * systems with a variety of st_dev reported. Also, btrfs
dd65c9
-         * subvolumes have different st_dev, even though they aren't
dd65c9
-         * real mounts of their own. */
dd65c9
-
dd65c9
-        r = name_to_handle_at(fd, filename, &h.handle, &mount_id, flags);
dd65c9
+        if (path_equal(t, "/"))
dd65c9
+                return 1;
dd65c9
+
dd65c9
+        r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
dd65c9
         if (r < 0) {
dd65c9
                 if (errno == ENOSYS)
dd65c9
                         /* This kernel does not support name_to_handle_at()
dd65c9
-                         * fall back to simpler logic. */
dd65c9
-                        goto fallback_fdinfo;
dd65c9
+                         * fall back to the traditional stat() logic. */
dd65c9
+                        goto fallback;
dd65c9
                 else if (errno == EOPNOTSUPP)
dd65c9
                         /* This kernel or file system does not support
dd65c9
-                         * name_to_handle_at(), hence let's see if the
dd65c9
-                         * upper fs supports it (in which case it is a
dd65c9
-                         * mount point), otherwise fallback to the
dd65c9
+                         * name_to_handle_at(), hence fallback to the
dd65c9
                          * traditional stat() logic */
dd65c9
                         nosupp = true;
dd65c9
+                else if (errno == ENOENT)
dd65c9
+                        return 0;
dd65c9
                 else
dd65c9
                         return -errno;
dd65c9
         }
dd65c9
 
dd65c9
-        r = name_to_handle_at(fd, "", &h_parent.handle, &mount_id_parent, AT_EMPTY_PATH);
dd65c9
-        if (r < 0) {
dd65c9
-                if (errno == EOPNOTSUPP) {
dd65c9
+        r = path_get_parent(t, &parent);
dd65c9
+        if (r < 0)
dd65c9
+                return r;
dd65c9
+
dd65c9
+        h.handle.handle_bytes = MAX_HANDLE_SZ;
dd65c9
+        r = name_to_handle_at(AT_FDCWD, parent, &h.handle, &mount_id_parent, AT_SYMLINK_FOLLOW);
dd65c9
+        if (r < 0)
dd65c9
+                if (errno == EOPNOTSUPP)
dd65c9
                         if (nosupp)
dd65c9
                                 /* Neither parent nor child do name_to_handle_at()?
dd65c9
                                    We have no choice but to fall back. */
dd65c9
-                                goto fallback_fdinfo;
dd65c9
+                                goto fallback;
dd65c9
                         else
dd65c9
-                                /* The parent can't do name_to_handle_at() but the
dd65c9
-                                 * directory we are interested in can?
dd65c9
+                                /* The parent can't do name_to_handle_at() but
dd65c9
+                                 * the directory we are interested in can?
dd65c9
+                                 * Or the other way around?
dd65c9
                                  * If so, it must be a mount point. */
dd65c9
                                 return 1;
dd65c9
-                } else
dd65c9
+                else
dd65c9
                         return -errno;
dd65c9
-        }
dd65c9
+        else
dd65c9
+                return mount_id != mount_id_parent;
dd65c9
 
dd65c9
-        /* The parent can do name_to_handle_at() but the
dd65c9
-         * directory we are interested in can't? If so, it
dd65c9
-         * must be a mount point. */
dd65c9
-        if (nosupp)
dd65c9
-                return 1;
dd65c9
+fallback:
dd65c9
+        if (allow_symlink)
dd65c9
+                r = stat(t, &a);
dd65c9
+        else
dd65c9
+                r = lstat(t, &a);
dd65c9
 
dd65c9
-        /* If the file handle for the directory we are
dd65c9
-         * interested in and its parent are identical, we
dd65c9
-         * assume this is the root directory, which is a mount
dd65c9
-         * point. */
dd65c9
+        if (r < 0) {
dd65c9
+                if (errno == ENOENT)
dd65c9
+                        return 0;
dd65c9
 
dd65c9
-        if (h.handle.handle_bytes == h_parent.handle.handle_bytes &&
dd65c9
-            h.handle.handle_type == h_parent.handle.handle_type &&
dd65c9
-            memcmp(h.handle.f_handle, h_parent.handle.f_handle, h.handle.handle_bytes) == 0)
dd65c9
-                return 1;
dd65c9
+                return -errno;
dd65c9
+        }
dd65c9
 
dd65c9
-        return mount_id != mount_id_parent;
dd65c9
+        free(parent);
dd65c9
+        parent = NULL;
dd65c9
 
dd65c9
-fallback_fdinfo:
dd65c9
-        r = fd_fdinfo_mnt_id(fd, filename, flags, &mount_id);
dd65c9
-        if (r == -EOPNOTSUPP)
dd65c9
-                goto fallback_fstat;
dd65c9
+        r = path_get_parent(t, &parent);
dd65c9
         if (r < 0)
dd65c9
                 return r;
dd65c9
 
dd65c9
-        r = fd_fdinfo_mnt_id(fd, "", AT_EMPTY_PATH, &mount_id_parent);
dd65c9
+        r = stat(parent, &b);
dd65c9
         if (r < 0)
dd65c9
-                return r;
dd65c9
-
dd65c9
-        if (mount_id != mount_id_parent)
dd65c9
-                return 1;
dd65c9
-
dd65c9
-        /* Hmm, so, the mount ids are the same. This leaves one
dd65c9
-         * special case though for the root file system. For that,
dd65c9
-         * let's see if the parent directory has the same inode as we
dd65c9
-         * are interested in. Hence, let's also do fstat() checks now,
dd65c9
-         * too, but avoid the st_dev comparisons, since they aren't
dd65c9
-         * that useful on unionfs mounts. */
dd65c9
-        check_st_dev = false;
dd65c9
-
dd65c9
-fallback_fstat:
dd65c9
-        /* yay for fstatat() taking a different set of flags than the other
dd65c9
-         * _at() above */
dd65c9
-        if (flags & AT_SYMLINK_FOLLOW)
dd65c9
-                flags &= ~AT_SYMLINK_FOLLOW;
dd65c9
-        else
dd65c9
-                flags |= AT_SYMLINK_NOFOLLOW;
dd65c9
-        if (fstatat(fd, filename, &a, flags) < 0)
dd65c9
-                return -errno;
dd65c9
-
dd65c9
-        if (fstatat(fd, "", &b, AT_EMPTY_PATH) < 0)
dd65c9
-                return -errno;
dd65c9
-
dd65c9
-        /* A directory with same device and inode as its parent? Must
dd65c9
-         * be the root directory */
dd65c9
-        if (a.st_dev == b.st_dev &&
dd65c9
-            a.st_ino == b.st_ino)
dd65c9
-                return 1;
dd65c9
-
dd65c9
-        return check_st_dev && (a.st_dev != b.st_dev);
dd65c9
-}
dd65c9
-
dd65c9
-/* flags can be AT_SYMLINK_FOLLOW or 0 */
dd65c9
-int path_is_mount_point(const char *t, int flags) {
dd65c9
-        _cleanup_close_ int fd = -1;
dd65c9
-        _cleanup_free_ char *canonical = NULL, *parent = NULL;
dd65c9
-
dd65c9
-        assert(t);
dd65c9
-
dd65c9
-        if (path_equal(t, "/"))
dd65c9
-                return 1;
dd65c9
-
dd65c9
-        /* we need to resolve symlinks manually, we can't just rely on
dd65c9
-         * fd_is_mount_point() to do that for us; if we have a structure like
dd65c9
-         * /bin -> /usr/bin/ and /usr is a mount point, then the parent that we
dd65c9
-         * look at needs to be /usr, not /. */
dd65c9
-        if (flags & AT_SYMLINK_FOLLOW) {
dd65c9
-                canonical = canonicalize_file_name(t);
dd65c9
-                if (!canonical)
dd65c9
-                        return -errno;
dd65c9
-
dd65c9
-                t = canonical;
dd65c9
-        }
dd65c9
-
dd65c9
-        parent = dirname_malloc(t);
dd65c9
-        if (!parent)
dd65c9
-                return -ENOMEM;
dd65c9
-
dd65c9
-        fd = openat(AT_FDCWD, parent, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_PATH);
dd65c9
-        if (fd < 0)
dd65c9
                 return -errno;
dd65c9
 
dd65c9
-        return fd_is_mount_point(fd, basename(t), flags);
dd65c9
+        return a.st_dev != b.st_dev;
dd65c9
 }
dd65c9
 
dd65c9
 int path_is_read_only_fs(const char *path) {
dd65c9
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
c62b8e
index e16484087f..71bb740e98 100644
dd65c9
--- a/src/shared/path-util.h
dd65c9
+++ b/src/shared/path-util.h
dd65c9
@@ -53,8 +53,7 @@ char** path_strv_make_absolute_cwd(char **l);
dd65c9
 char** path_strv_resolve(char **l, const char *prefix);
dd65c9
 char** path_strv_resolve_uniq(char **l, const char *prefix);
dd65c9
 
dd65c9
-int fd_is_mount_point(int fd, const char *filename, int flags);
dd65c9
-int path_is_mount_point(const char *path, int flags);
dd65c9
+int path_is_mount_point(const char *path, bool allow_symlink);
dd65c9
 int path_is_read_only_fs(const char *path);
dd65c9
 int path_is_os_tree(const char *path);
dd65c9
 
dd65c9
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
c62b8e
index 8870f178a1..6396fcb398 100644
dd65c9
--- a/src/test/test-path-util.c
dd65c9
+++ b/src/test/test-path-util.c
dd65c9
@@ -21,7 +21,6 @@
dd65c9
 
dd65c9
 #include <stdio.h>
dd65c9
 #include <unistd.h>
dd65c9
-#include <sys/mount.h>
dd65c9
 
dd65c9
 #include "path-util.h"
dd65c9
 #include "util.h"
dd65c9
@@ -86,8 +85,8 @@ static void test_path(void) {
dd65c9
         test_parent("/aa///file...", "/aa///");
dd65c9
         test_parent("file.../", NULL);
dd65c9
 
dd65c9
-        assert_se(path_is_mount_point("/", AT_SYMLINK_FOLLOW));
dd65c9
-        assert_se(path_is_mount_point("/", 0));
dd65c9
+        assert_se(path_is_mount_point("/", true));
dd65c9
+        assert_se(path_is_mount_point("/", false));
dd65c9
 
dd65c9
         {
dd65c9
                 char p1[] = "aaa/bbb////ccc";
dd65c9
@@ -100,66 +99,6 @@ static void test_path(void) {
dd65c9
         }
dd65c9
 }
dd65c9
 
dd65c9
-static void test_path_is_mount_point(void) {
dd65c9
-        int fd, rt, rf, rlt, rlf;
dd65c9
-        char tmp_dir[] = "/tmp/test-path-is-mount-point-XXXXXX";
dd65c9
-        _cleanup_free_ char *file1 = NULL, *file2 = NULL, *link1 = NULL, *link2 = NULL;
dd65c9
-
dd65c9
-        assert_se(path_is_mount_point("/", AT_SYMLINK_FOLLOW) > 0);
dd65c9
-        assert_se(path_is_mount_point("/", 0) > 0);
dd65c9
-
dd65c9
-        assert_se(path_is_mount_point("/proc", AT_SYMLINK_FOLLOW) > 0);
dd65c9
-        assert_se(path_is_mount_point("/proc", 0) > 0);
dd65c9
-
dd65c9
-        assert_se(path_is_mount_point("/proc/1", AT_SYMLINK_FOLLOW) == 0);
dd65c9
-        assert_se(path_is_mount_point("/proc/1", 0) == 0);
dd65c9
-
dd65c9
-        assert_se(path_is_mount_point("/sys", AT_SYMLINK_FOLLOW) > 0);
dd65c9
-        assert_se(path_is_mount_point("/sys", 0) > 0);
dd65c9
-
dd65c9
-        /* file mountpoints */
dd65c9
-        assert_se(mkdtemp(tmp_dir) != NULL);
dd65c9
-        file1 = path_join(NULL, tmp_dir, "file1");
dd65c9
-        assert_se(file1);
dd65c9
-        file2 = path_join(NULL, tmp_dir, "file2");
dd65c9
-        assert_se(file2);
dd65c9
-        fd = open(file1, O_WRONLY|O_CREAT|O_EXCL|O_CLOEXEC, 0664);
dd65c9
-        assert_se(fd > 0);
dd65c9
-        close(fd);
dd65c9
-        fd = open(file2, O_WRONLY|O_CREAT|O_EXCL|O_CLOEXEC, 0664);
dd65c9
-        assert_se(fd > 0);
dd65c9
-        close(fd);
dd65c9
-        link1 = path_join(NULL, tmp_dir, "link1");
dd65c9
-        assert_se(link1);
dd65c9
-        assert_se(symlink("file1", link1) == 0);
dd65c9
-        link2 = path_join(NULL, tmp_dir, "link2");
dd65c9
-        assert_se(link1);
dd65c9
-        assert_se(symlink("file2", link2) == 0);
dd65c9
-
dd65c9
-        assert_se(path_is_mount_point(file1, AT_SYMLINK_FOLLOW) == 0);
dd65c9
-        assert_se(path_is_mount_point(file1, 0) == 0);
dd65c9
-        assert_se(path_is_mount_point(link1, AT_SYMLINK_FOLLOW) == 0);
dd65c9
-        assert_se(path_is_mount_point(link1, 0) == 0);
dd65c9
-
dd65c9
-        /* this test will only work as root */
dd65c9
-        if (mount(file1, file2, NULL, MS_BIND, NULL) >= 0) {
dd65c9
-                rf = path_is_mount_point(file2, 0);
dd65c9
-                rt = path_is_mount_point(file2, AT_SYMLINK_FOLLOW);
dd65c9
-                rlf = path_is_mount_point(link2, 0);
dd65c9
-                rlt = path_is_mount_point(link2, AT_SYMLINK_FOLLOW);
dd65c9
-
dd65c9
-                assert_se(umount(file2) == 0);
dd65c9
-
dd65c9
-                assert_se(rf == 1);
dd65c9
-                assert_se(rt == 1);
dd65c9
-                assert_se(rlf == 0);
dd65c9
-                assert_se(rlt == 1);
dd65c9
-        } else
dd65c9
-                printf("Skipping bind mount file test: %m\n");
dd65c9
-
dd65c9
-        assert_se(rm_rf(tmp_dir, false, true, false) == 0);
dd65c9
-}
dd65c9
-
dd65c9
 static void test_find_binary(const char *self, bool local) {
dd65c9
         char *p;
dd65c9
 
dd65c9
@@ -349,7 +288,6 @@ int main(int argc, char **argv) {
dd65c9
         test_make_relative();
dd65c9
         test_strv_resolve();
dd65c9
         test_path_startswith();
dd65c9
-        test_path_is_mount_point();
dd65c9
 
dd65c9
         return 0;
dd65c9
 }