loop-util: close lock fd before trying LOOP_CLR_FD in failure path

If the loopback device is open more than once LOOP_CLR_FD will fail,
hence close the lock fd first explicitly, so there's definitely only one
fd left.

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 81682994de6cd061795d3c2cc543b94096250789..6cb370e95079484191d80c665082ae30904c4f1f 100644 (file)
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -341,6 +341,9 @@ success:
         return 0;
 
 fail:
+        /* Close the lock fd explicitly before clearing the loopback block device, since an additional open
+         * fd would block the clearing to succeed */
+        lock_fd = safe_close(lock_fd);
         (void) ioctl(fd, LOOP_CLR_FD);
         return r;
 }