File more-reliable-informing-the-kernel.patch of Package parted

Overview Repositories Revisions Requests Users Attributes Meta

File more-reliable-informing-the-kernel.patch of Package parted (Revision baff15b69dfa8574b4217824c745e747)

Currently displaying revision baff15b69dfa8574b4217824c745e747 , Show latest

# bnc#657360
#
# This patch should make parted's process of informing the kernel
# about changes of partition table sligtly more reliable.
# It consists of 3 quite unrelated parts:
#
# 1. increase the max sleep time if partition is busy from 1 to 2 seconds
# 2. do not inform the kernel when only partition flags change - kernel
#    does not care about the flags
# 3. call 'udevadm settle' before doing BLKPG_DEL_PARTITION ioctl()
---
 libparted/arch/linux.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: parted-2.3/libparted/arch/linux.c
===================================================================
--- parted-2.3.orig/libparted/arch/linux.c
+++ parted-2.3/libparted/arch/linux.c
@@ -2460,10 +2460,12 @@ _disk_sync_part_table (PedDisk* disk)
         if (!errnums)
                 goto cleanup;
 
+	system("/sbin/udevadm settle --timeout=20");
+
         /* Attempt to remove each and every partition, retrying for
            up to max_sleep_seconds upon any failure due to EBUSY. */
         unsigned int sleep_microseconds = 10000;
-        unsigned int max_sleep_seconds = 1;
+        unsigned int max_sleep_seconds = 2;
         unsigned int n_sleep = (max_sleep_seconds
                                 * 1000000 / sleep_microseconds);
         int i;
Index: parted-2.3/parted/parted.c
===================================================================
--- parted-2.3.orig/parted/parted.c
+++ parted-2.3/parted/parted.c
@@ -272,6 +272,32 @@ _disk_warn_loss (PedDisk* disk)
                 disk->dev->path) == PED_EXCEPTION_YES;
 }
 
+/*
+ * Copied from ped_disk_commit() but removed the ped_disk_commit_to_os. We use
+ * this function in do_set - BLKPG* ioctls() does not care about the partition
+ * flags anyway.
+ */
+static int
+ped_disk_commit_just_to_disk (PedDisk* disk)
+{
+        /* Open the device here, so that the underlying fd is not closed
+           between commit_to_dev and commit_to_os (closing causes unwanted
+           udev events to be sent under Linux). */
+	if (!ped_device_open (disk->dev))
+		goto error;
+
+	if (!ped_disk_commit_to_dev (disk))
+		goto error_close_dev;
+
+	ped_device_close (disk->dev);
+	return 1;
+
+error_close_dev:
+	ped_device_close (disk->dev);
+error:
+	return 0;
+}
+
 /* This function changes "sector" to "new_sector" if the new value lies
  * within the required range.
  */
@@ -2200,7 +2226,7 @@ do_set (PedDevice** dev)
 
         if (!ped_partition_set_flag (part, flag, state))
 	        	goto error_destroy_disk;
-    	if (!ped_disk_commit (disk))
+    	if (!ped_disk_commit_just_to_disk (disk))
 	        	goto error_destroy_disk;
     	ped_disk_destroy (disk);

Places

File more-reliable-informing-the-kernel.patch of Package parted (Revision baff15b69dfa8574b4217824c745e747)

Places