From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 20 Jan 2025 20:43:39 +0000 (+0100)
Subject: mountpoint-util: check >= 0 for success
X-Git-Tag: v258-rc1~1536^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=229429a79927cf6dfc60fb298ac6e0994c08218e;p=thirdparty%2Fsystemd.git

mountpoint-util: check >= 0 for success
---

diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index 4ae5f5191fe..f87e7342de5 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -137,9 +137,7 @@ int name_to_handle_at_try_fid(
          * (i.e. older than Linux 6.5). */
 
         r = name_to_handle_at_loop(fd, path, ret_handle, ret_mnt_id, flags | AT_HANDLE_FID);
-        if (r >= 0)
-                return r;
-        if (is_name_to_handle_at_fatal_error(r))
+        if (r >= 0 || is_name_to_handle_at_fatal_error(r))
                 return r;
 
         return name_to_handle_at_loop(fd, path, ret_handle, ret_mnt_id, flags & ~AT_HANDLE_FID);
@@ -400,7 +398,7 @@ int path_get_mnt_id_at_fallback(int dir_fd, const char *path, int *ret) {
         assert(ret);
 
         r = name_to_handle_at_loop(dir_fd, path, NULL, ret, isempty(path) ? AT_EMPTY_PATH : 0);
-        if (r == 0 || is_name_to_handle_at_fatal_error(r))
+        if (r >= 0 || is_name_to_handle_at_fatal_error(r))
                 return r;
 
         return fd_fdinfo_mnt_id(dir_fd, path, isempty(path) ? AT_EMPTY_PATH : 0, ret);