]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect: minor simplifications
authorLennart Poettering <lennart@poettering.net>
Tue, 12 Nov 2024 08:45:05 +0000 (09:45 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Jan 2025 15:43:43 +0000 (16:43 +0100)
src/dissect/dissect.c

index 7709f42c48854850ac09bb4d3a5ae32c0e89ad68..91f0f1de136b5dde5ea8316e7be4e3d7972fad20 100644 (file)
@@ -1472,7 +1472,7 @@ static int action_list_or_mtree_or_copy_or_make_archive(DissectedImage *m, LoopD
                 if (r < 0)
                         return r;
 
-                mounted_dir = TAKE_PTR(t);
+                root = mounted_dir = TAKE_PTR(t);
 
                 if (d) {
                         r = loop_device_flock(d, LOCK_UN);
@@ -1483,11 +1483,10 @@ static int action_list_or_mtree_or_copy_or_make_archive(DissectedImage *m, LoopD
                 r = dissected_image_relinquish(m);
                 if (r < 0)
                         return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
-        }
-
-        root = mounted_dir ?: arg_root;
 
-        dissected_image_close(m);
+                dissected_image_close(m);
+        } else
+                root = arg_root;
 
         switch (arg_action) {