From: Luca Boccassi <bluca@debian.org>
Date: Thu, 16 Nov 2023 21:13:10 +0000 (+0000)
Subject: loop-util: use the right error variable in log_debug_errno after fd_reopen
X-Git-Tag: v255-rc3~45^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d579c42e9d2e2c332d18fdd863019f80bef92af7;p=thirdparty%2Fsystemd.git

loop-util: use the right error variable in log_debug_errno after fd_reopen
---

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index fdf33fac2ad..b11e9268aff 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -489,10 +489,10 @@ static int loop_device_make_internal(
                 reopened_fd = fd_reopen(fd, (FLAGS_SET(loop_flags, LO_FLAGS_DIRECT_IO) ? O_DIRECT : 0)|O_CLOEXEC|O_NONBLOCK|open_flags);
                 if (reopened_fd < 0) {
                         if (!FLAGS_SET(loop_flags, LO_FLAGS_DIRECT_IO))
-                                return log_debug_errno(errno, "Failed to reopen file descriptor without O_DIRECT: %m");
+                                return log_debug_errno(reopened_fd, "Failed to reopen file descriptor without O_DIRECT: %m");
 
                         /* Some file systems might not support O_DIRECT, let's gracefully continue without it then. */
-                        log_debug_errno(errno, "Failed to enable O_DIRECT for backing file descriptor for loopback device. Continuing without.");
+                        log_debug_errno(reopened_fd, "Failed to enable O_DIRECT for backing file descriptor for loopback device. Continuing without.");
                         loop_flags &= ~LO_FLAGS_DIRECT_IO;
                 } else
                         fd = reopened_fd; /* From now on, operate on our new O_DIRECT fd */