Merge branch 'queue' into next

Author: mwilck

NEWS.md

@@ -49,6 +49,11 @@ See [README.md](README.md) for additional information.
   Fixes [#145](https://github.com/opensvc/multipath-tools/issues/145).
 * An overlong partition delimiter (-p option) could cause kpartx to crash.
   Fix it. Commit a2f344a.
+* Even with the libudev wrapper code introduced in 0.14.0, multipathd ran into
+  use-after-free errors in tests where multipathd was restarted frequently.
+  Fix this by preventing thread cancellation during libudev calls.
+  Fixes [#152](https://github.com/opensvc/multipath-tools/issues/152).
+  Commit b424465.
 
 ### Other changes
 

kpartx/kpartx.c

@@ -577,10 +577,11 @@ main(int argc, char **argv){
 
 			for (j = MAXSLICES-1; j >= 0; j--) {
 				char *part_uuid = NULL, *reason;
-				int res = dm_find_part(mapname, delim, j + 1, uuid,
-						       partname, sizeof(partname),
-						       &part_uuid, verbose);
-				if (slices[j].size || res != DFP_DEVICE_RELOAD)
+
+				if (slices[j].size ||
+				    dm_find_part(mapname, delim, j + 1, uuid, partname,
+						 sizeof(partname), &part_uuid,
+						 verbose) != DFP_DEVICE_RELOAD)
 					continue;
 
 				if (part_uuid && uuid) {