Simplify execute_directory()

[elogind.git] / src / shared / path-util.c

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 8c43d060fb2ed93f1eb008f4c56cb63cfe3352a9..ee87c7493defead6eacea8ee32ad68c4ed0eee38 100644 (file)
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -458,7 +458,7 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
                 .handle.handle_bytes = MAX_HANDLE_SZ
         };
 
-        int mount_id, mount_id_parent;
+        int mount_id = -1, mount_id_parent = -1;
         _cleanup_free_ char *parent = NULL;
         struct stat a, b;
         int r;
@@ -473,7 +473,11 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
 
         r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
         if (r < 0) {
-                if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
+                if (errno == ENOSYS)
+                        /* This kernel does not support name_to_handle_at()
+                         * fall back to the traditional stat() logic. */
+                        goto fallback;
+                else if (errno == EOPNOTSUPP)
                         /* This kernel or file system does not support
                          * name_to_handle_at(), hence fallback to the
                          * traditional stat() logic */
@@ -520,6 +524,9 @@ fallback:
                 return -errno;
         }
 
+        free(parent);
+        parent = NULL;
+
         r = path_get_parent(t, &parent);
         if (r < 0)
                 return r;