summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/path-util.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 373dd7a35c..69fcb1660a 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -324,11 +324,15 @@ bool path_equal(const char *a, const char *b) {
}
int path_is_mount_point(const char *t, bool allow_symlink) {
- char *parent;
- int r;
- struct file_handle *h;
+
+ union file_handle_union h = {
+ .handle.handle_bytes = MAX_HANDLE_SZ
+ };
+
int mount_id, mount_id_parent;
+ char *parent;
struct stat a, b;
+ int r;
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
@@ -337,12 +341,9 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
if (path_equal(t, "/"))
return 1;
- h = alloca(MAX_HANDLE_SZ);
- h->handle_bytes = MAX_HANDLE_SZ;
-
- r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
+ r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
- if (errno == ENOSYS || errno == ENOTSUP)
+ if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
/* This kernel or file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
@@ -358,15 +359,14 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
if (r < 0)
return r;
- h->handle_bytes = MAX_HANDLE_SZ;
- r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
+ h.handle.handle_bytes = MAX_HANDLE_SZ;
+ r = name_to_handle_at(AT_FDCWD, parent, &h.handle, &mount_id_parent, 0);
free(parent);
-
if (r < 0) {
/* The parent can't do name_to_handle_at() but the
* directory we are interested in can? If so, it must
* be a mount point */
- if (errno == ENOTSUP)
+ if (errno == EOPNOTSUPP)
return 1;
return -errno;
@@ -393,7 +393,6 @@ fallback:
r = lstat(parent, &b);
free(parent);
-
if (r < 0)
return -errno;