From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 Oct 2021 07:57:16 +0000 (+0200)
Subject: loop-util: call loop_device_make_internal() at the right place
X-Git-Tag: v250-rc1~466^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F21061%2Fhead;p=thirdparty%2Fsystemd.git

loop-util: call loop_device_make_internal() at the right place

The whole reason loop_device_make_internal() exists (as opposed to just
loop_device_make()) is to avoid mangling the loop flags value/call
getenv twice. Hence let's actually call it when we already mangled the
flags value.
---

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index f2f4ab481d4..2da101b748b 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -695,7 +695,7 @@ int loop_device_make_by_path(
                   direct ? "enabled" : "disabled",
                   direct != (direct_flags != 0) ? " (O_DIRECT was requested but not supported)" : "");
 
-        return loop_device_make(fd, open_flags, 0, 0, loop_flags, ret);
+        return loop_device_make_internal(fd, open_flags, 0, 0, loop_flags, ret);
 }
 
 LoopDevice* loop_device_unref(LoopDevice *d) {