forked from pool/parted
987a8290eb
robust by sleeping between every retry and by placing exclusive file lock on the blockdevice (bnc#886005) - libparted-make-BLKRRPART-more-robust.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=97
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
---
|
|
libparted/arch/linux.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
Index: parted-3.1/libparted/arch/linux.c
|
|
===================================================================
|
|
--- parted-3.1.orig/libparted/arch/linux.c
|
|
+++ parted-3.1/libparted/arch/linux.c
|
|
@@ -40,6 +40,7 @@
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <sys/utsname.h> /* for uname() */
|
|
+#include <sys/file.h>
|
|
#include <scsi/scsi.h>
|
|
#include <assert.h>
|
|
#ifdef ENABLE_DEVICE_MAPPER
|
|
@@ -2901,14 +2902,15 @@ static int
|
|
_kernel_reread_part_table (PedDevice* dev)
|
|
{
|
|
LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev);
|
|
- int retry_count = 9;
|
|
+ int retry_count = 5;
|
|
|
|
sync();
|
|
+ flock(arch_specific->fd, LOCK_EX);
|
|
while (ioctl (arch_specific->fd, BLKRRPART)) {
|
|
retry_count--;
|
|
sync();
|
|
- if (retry_count == 3)
|
|
- sleep(1); /* Pause to allow system to settle */
|
|
+
|
|
+ sleep(1); /* Pause to allow system to settle */
|
|
|
|
if (!retry_count) {
|
|
ped_exception_throw (
|
|
@@ -2918,10 +2920,12 @@ _kernel_reread_part_table (PedDevice* de
|
|
"table on %s (%s). As a result, it may not "
|
|
"reflect all of your changes until after reboot."),
|
|
dev->path, strerror (errno));
|
|
+ flock(arch_specific->fd, LOCK_UN);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
+ flock(arch_specific->fd, LOCK_UN);
|
|
return 1;
|
|
}
|
|
|