chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: make path_is_mount_point() recognize bind mounts, too
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 8bc7955020e1ba7fec1cc9719ff96e91c9d10b7b..2bdbd22dc71becce8484dec92fb81dc8326e68ef 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-330,15
+330,22
@@
bool path_equal(const char *a, const char *b) {
}
int path_is_mount_point(const char *t, bool allow_symlink) {
}
int path_is_mount_point(const char *t, bool allow_symlink) {
- struct stat a, b;
char *parent;
int r;
char *parent;
int r;
+ struct file_handle *h;
+ int mount_id, mount_id_parent;
- if (allow_symlink)
- r = stat(t, &a);
- else
- r = lstat(t, &a);
+ /* We are not actually interested in the file handles, but
+ * name_to_handle_at() also passes us the mount ID, hence use
+ * it but throw the handle away */
+
+ 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);
if (r < 0) {
if (errno == ENOENT)
return 0;
if (r < 0) {
if (errno == ENOENT)
return 0;
@@
-350,13
+357,15
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = lstat(parent, &b);
+ h->handle_bytes = MAX_HANDLE_SZ;
+ r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
if (r < 0)
return -errno;
free(parent);
if (r < 0)
return -errno;
- return a.st_dev != b.st_dev;
+
+ return mount_id != mount_id_parent;
}
int path_is_read_only_fs(const char *path) {
}
int path_is_read_only_fs(const char *path) {