|
 |
a59965a |
From 40d9f7140b14274413e4f604b5c54aab6b07a3bd Mon Sep 17 00:00:00 2001
|
|
|
a59965a |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
a59965a |
Date: Thu, 24 Apr 2014 07:46:31 +0200
|
|
|
a59965a |
Subject: [PATCH] util: make sure all our name_to_handle_at() code makes use of
|
|
|
a59965a |
file_handle_union
|
|
|
a59965a |
|
|
|
a59965a |
(cherry picked from commit 21749924e12201d8f5210c5dc9695e18fd16bb93)
|
|
|
a59965a |
(cherry picked from commit 6b494ffbcb54873508b6ca18ec93dfa20221d542)
|
|
|
a59965a |
|
|
|
a59965a |
Conflicts:
|
|
|
a59965a |
src/libudev/libudev-monitor.c
|
|
|
a59965a |
---
|
|
|
a59965a |
src/shared/path-util.c | 25 ++++++++++++-------------
|
|
|
a59965a |
1 file changed, 12 insertions(+), 13 deletions(-)
|
|
|
a59965a |
|
|
|
a59965a |
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
|
|
|
a59965a |
index 45099ee..d8c14e8 100644
|
|
|
a59965a |
--- a/src/shared/path-util.c
|
|
|
a59965a |
+++ b/src/shared/path-util.c
|
|
|
a59965a |
@@ -327,11 +327,15 @@ bool path_equal(const char *a, const char *b) {
|
|
|
a59965a |
}
|
|
|
a59965a |
|
|
|
a59965a |
int path_is_mount_point(const char *t, bool allow_symlink) {
|
|
|
a59965a |
- char *parent;
|
|
|
a59965a |
- int r;
|
|
|
a59965a |
- struct file_handle *h;
|
|
|
a59965a |
+
|
|
|
a59965a |
+ union file_handle_union h = {
|
|
|
a59965a |
+ .handle.handle_bytes = MAX_HANDLE_SZ
|
|
|
a59965a |
+ };
|
|
|
a59965a |
+
|
|
|
a59965a |
int mount_id, mount_id_parent;
|
|
|
a59965a |
+ char *parent;
|
|
|
a59965a |
struct stat a, b;
|
|
|
a59965a |
+ int r;
|
|
|
a59965a |
|
|
|
a59965a |
/* We are not actually interested in the file handles, but
|
|
|
a59965a |
* name_to_handle_at() also passes us the mount ID, hence use
|
|
|
a59965a |
@@ -340,12 +344,9 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
|
|
|
a59965a |
if (path_equal(t, "/"))
|
|
|
a59965a |
return 1;
|
|
|
a59965a |
|
|
|
a59965a |
- h = alloca(MAX_HANDLE_SZ);
|
|
|
a59965a |
- h->handle_bytes = MAX_HANDLE_SZ;
|
|
|
a59965a |
-
|
|
|
a59965a |
- r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
|
|
|
a59965a |
+ r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
|
|
|
a59965a |
if (r < 0) {
|
|
|
a59965a |
- if (errno == ENOSYS || errno == ENOTSUP)
|
|
|
a59965a |
+ if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
|
|
|
a59965a |
/* This kernel or file system does not support
|
|
|
a59965a |
* name_to_handle_at(), hence fallback to the
|
|
|
a59965a |
* traditional stat() logic */
|
|
|
a59965a |
@@ -361,15 +362,14 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
|
|
|
a59965a |
if (r < 0)
|
|
|
a59965a |
return r;
|
|
|
a59965a |
|
|
|
a59965a |
- h->handle_bytes = MAX_HANDLE_SZ;
|
|
|
a59965a |
- r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
|
|
|
a59965a |
+ h.handle.handle_bytes = MAX_HANDLE_SZ;
|
|
|
a59965a |
+ r = name_to_handle_at(AT_FDCWD, parent, &h.handle, &mount_id_parent, 0);
|
|
|
a59965a |
free(parent);
|
|
|
a59965a |
-
|
|
|
a59965a |
if (r < 0) {
|
|
|
a59965a |
/* The parent can't do name_to_handle_at() but the
|
|
|
a59965a |
* directory we are interested in can? If so, it must
|
|
|
a59965a |
* be a mount point */
|
|
|
a59965a |
- if (errno == ENOTSUP)
|
|
|
a59965a |
+ if (errno == EOPNOTSUPP)
|
|
|
a59965a |
return 1;
|
|
|
a59965a |
|
|
|
a59965a |
return -errno;
|
|
|
a59965a |
@@ -396,7 +396,6 @@ fallback:
|
|
|
a59965a |
|
|
|
a59965a |
r = lstat(parent, &b);
|
|
|
a59965a |
free(parent);
|
|
|
a59965a |
-
|
|
|
a59965a |
if (r < 0)
|
|
|
a59965a |
return -errno;
|
|
|
a59965a |
|