shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

dissect: minor simplifications

Browse Source
This commit is contained in:
Lennart Poettering 2024-11-12 09:45:05 +01:00
parent 4ee940f5e2
commit 796d87aa73
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dissect/dissect.c
View File

@ -1464,7 +1464,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);
@ -1475,11 +1475,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) {