~ubuntu-branches/ubuntu/utopic/parted/utopic-proposed

From a8e217730f8fb7152845c3748b1236d0e7c2c360 Mon Sep 17 00:00:00 2001

From: "Brian C. Lane" <bcl@redhat.com>

Date: Fri, 28 Mar 2014 17:10:08 +0000

Subject: Remove DASD restriction on _disk_sync_part_table

 

Origin: upstream, http://git.debian.org/?p=parted/parted.git;a=commitdiff;h=9fa0e1800db5b9f094ae481fd95a51da03f19e95

Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=651478

Bug-Debian: http://bugs.debian.org/605759

Forwarded: not-needed

Last-Update: 2010-12-19

 

Patch-Name: dasd-sync.patch

---

 libparted/arch/linux.c | 22 +++++++++-------------

 1 file changed, 9 insertions(+), 13 deletions(-)

 

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c

index bccc2c2..69088f9 100644

--- a/libparted/arch/linux.c

+++ b/libparted/arch/linux.c

@@ -40,6 +40,7 @@

 #include <sys/types.h>

 #include <sys/utsname.h>        /* for uname() */

 #include <scsi/scsi.h>

+#include <assert.h>

 #ifdef ENABLE_DEVICE_MAPPER

 #include <libdevmapper.h>

 #endif

@@ -2944,20 +2945,15 @@ linux_disk_commit (PedDisk* disk)

                 return 1;

 

         if (disk->dev->type != PED_DEVICE_FILE) {

-                /* The ioctl() command BLKPG_ADD_PARTITION does not notify

-                 * the devfs system; consequently, /proc/partitions will not

-                 * be up to date, and the proper links in /dev are not

-                 * created.  Therefore, if using DevFS, we must get the kernel

-                 * to re-read and grok the partition table.

-                 */

-                /* Work around kernel dasd problem so we really do BLKRRPART */

-               int ok = 1;

-               if (disk->dev->type != PED_DEVICE_DASD && _have_blkpg ()) {

-                       if (!_disk_sync_part_table (disk))

-                         ok = 0;

-               }

 

-                return ok;

+               /* We now require BLKPG support.  If this assertion fails,

+                  please write to the mailing list describing your system.

+                  Assuming it's never triggered, ...

+                  FIXME: remove this assertion in 2012.  */

+               assert (_have_blkpg ());

+

+               if (!_disk_sync_part_table (disk))

+                       return 0;

         }

 

         return 1;