b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Wed, 24 Feb 2021 00:05:13 -0600
|
|
Subject: [PATCH] kpartx: free loop device after listing partitions
|
|
|
|
If "kpartx -l" is run on a file that doesn't already have a loop device
|
|
associated with it, it will create a loop device to run the command.
|
|
Starting with da59d15c6 ("Fix loopback file with kpartx -av"), it will
|
|
not free the loop device when exitting. This is because it checks if the
|
|
the file it stat()ed is a regular file, before freeing the loop device.
|
|
However, after da59d15c6, stat() is rerun on the loop device itself, so
|
|
the check fails. There is no need to check this, if loopcreated is
|
|
true, then the file will be a kpartx created loop device, and should be
|
|
freed.
|
|
|
|
Also, keep kpartx from printing that the loop device has been removed
|
|
at normal verbosity.
|
|
|
|
Fixes: da59d15c6 ("Fix loopback file with kpartx -av")
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
kpartx/kpartx.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
|
|
index 6a7933fa..8ff116b8 100644
|
|
--- a/kpartx/kpartx.c
|
|
+++ b/kpartx/kpartx.c
|
|
@@ -424,7 +424,7 @@ main(int argc, char **argv){
|
|
fprintf(stderr, "can't del loop : %s\n",
|
|
loopdev);
|
|
r = 1;
|
|
- } else
|
|
+ } else if (verbose)
|
|
fprintf(stderr, "loop deleted : %s\n", loopdev);
|
|
}
|
|
goto end;
|
|
@@ -668,16 +668,17 @@ main(int argc, char **argv){
|
|
if (n > 0)
|
|
break;
|
|
}
|
|
- if (what == LIST && loopcreated && S_ISREG (buf.st_mode)) {
|
|
+ if (what == LIST && loopcreated) {
|
|
if (fd != -1)
|
|
close(fd);
|
|
if (del_loop(device)) {
|
|
if (verbose)
|
|
- printf("can't del loop : %s\n",
|
|
+ fprintf(stderr, "can't del loop : %s\n",
|
|
device);
|
|
exit(1);
|
|
}
|
|
- printf("loop deleted : %s\n", device);
|
|
+ if (verbose)
|
|
+ fprintf(stderr, "loop deleted : %s\n", device);
|
|
}
|
|
|
|
end:
|