Merge lp:~psusi/ubuntu/precise/parted/fix-dmsync into lp:ubuntu/precise/parted

[Phillip Susi]

[lp:~psusi/ubuntu/precise/parted/fix-dmsync]

111. By Phillip Susi on 2012-07-17

Fix dm-part-sync.patch to canonicalize the dm name when constructing
the partition device path (LP: #1012946)

[Bryce Harrington (bryce)]

Looks good, uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 20:24:21 +0000
+++ debian/changelog	2012-07-17 14:36:20 +0000
@@ -1,3 +1,10 @@
+parted (2.3-8ubuntu5.1) precise; urgency=low
+
+  * Fix dm-part-sync.patch to canonicalize the dm name when constructing
+    the partition device path (LP: #1012946)
+
+ -- Phillip Susi <[e-mail]>  Sat, 16 Jun 2012 21:26:34 -0400
+
 parted (2.3-8ubuntu5) precise; urgency=low
 
   * Backport from upstream:

=== modified file 'debian/patches/dm-part-sync.patch'
--- debian/patches/dm-part-sync.patch	2012-01-13 19:49:30 +0000
+++ debian/patches/dm-part-sync.patch	2012-07-17 14:36:20 +0000
@@ -5,8 +5,6 @@
  all partitions, then add new partitions method.  Refactor to use the same
  algorithm as regular disks: try to remove all, and ignore any that could not
  be removed but have not changed.
-Index: b/libparted/arch/linux.c
-===================================================================
 --- a/libparted/arch/linux.c
 +++ b/libparted/arch/linux.c
 @@ -270,6 +270,16 @@
@@ -26,7 +24,83 @@
  
  
  static int
-@@ -2579,6 +2589,23 @@
+@@ -2230,10 +2240,39 @@
+                 _probe_proc_partitions ();
+ }
+ 
++static char *dm_canonical_path (PedDevice *dev)
++{
++        char*           dev_name = NULL;
++        LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
++
++        /* Get map name from devicemapper */
++        struct dm_task *task = dm_task_create (DM_DEVICE_INFO);
++        if (!task)
++                goto err;
++        if (!dm_task_set_major_minor (task, arch_specific->major,
++                                      arch_specific->minor, 0))
++                goto err;
++        if (!dm_task_run(task))
++                goto err;
++        dev_name = ped_malloc (strlen (dm_task_get_name (task)) +
++                               strlen ("/dev/mapper/") + 1);
++        strcpy (dev_name, "/dev/mapper/");
++        strcat (dev_name, dm_task_get_name (task));
++        /* Caution: dm_task_destroy frees dev_name.  */
++        dm_task_destroy (task);
++        return dev_name;
++err:
++        return NULL;
++}
++
+ static char*
+ _device_get_part_path (PedDevice* dev, int num)
+ {
+-        int             path_len = strlen (dev->path);
++        char*           devpath;
++        if (dev->type == PED_DEVICE_DM)
++                devpath = dm_canonical_path (dev);
++        else devpath = dev->path;
++        int             path_len = strlen (devpath);
+         int             result_len = path_len + 16;
+         char*           result;
+ 
+@@ -2244,18 +2283,19 @@
+         /* Check for devfs-style /disc => /partN transformation
+            unconditionally; the system might be using udev with devfs rules,
+            and if not the test is harmless. */
+-        if (!strcmp (dev->path + path_len - 5, "/disc")) {
++        if (!strcmp (devpath + path_len - 5, "/disc")) {
+                 /* replace /disc with /path%d */
+-                strcpy (result, dev->path);
++                strcpy (result, devpath);
+                 snprintf (result + path_len - 5, 16, "/part%d", num);
+         } else if (dev->type == PED_DEVICE_DAC960
+                         || dev->type == PED_DEVICE_CPQARRAY
+                         || dev->type == PED_DEVICE_ATARAID
+-                        || isdigit (dev->path[path_len - 1]))
+-                snprintf (result, result_len, "%sp%d", dev->path, num);
++                        || isdigit (devpath[path_len - 1]))
++                snprintf (result, result_len, "%sp%d", devpath, num);
+         else
+-                snprintf (result, result_len, "%s%d", dev->path, num);
+-
++                snprintf (result, result_len, "%s%d", devpath, num);
++        if (dev->type == PED_DEVICE_DM)
++                free (devpath);
+         return result;
+ }
+ 
+@@ -2542,6 +2582,8 @@
+         FILE*       fp;
+         bool        ok;
+ 
++        if (dev->type == PED_DEVICE_DM)
++                return MAX_NUM_PARTS;
+         r = snprintf(path, sizeof(path), "/sys/block/%s/ext_range",
+                      last_component(dev->path));
+         if (r < 0 || r >= sizeof(path))
+@@ -2579,6 +2621,23 @@
          PED_ASSERT(disk->dev != NULL, return 0);
          int lpn;
  
@@ -50,7 +124,7 @@
          /* lpn = largest partition number. */
          if (ped_disk_get_max_supported_partition_count(disk, &lpn))
                  lpn = PED_MIN(lpn, _device_get_partition_range(disk->dev));
-@@ -2612,7 +2639,7 @@
+@@ -2612,7 +2671,7 @@
              int j;
              for (j = 0; j < lpn; j++) {
                  if (!ok[j]) {
@@ -59,18 +133,20 @@
                      errnums[j] = errno;
                      if (!ok[j] && errnums[j] == EBUSY)
                          busy = true;
-@@ -2629,8 +2656,8 @@
+@@ -2629,9 +2688,9 @@
                                  unsigned long long length;
                                  unsigned long long start;
                                  /* get start and length of existing partition */
 -                                if (!_kernel_get_partition_start_and_length(part,
 -                                                                &start, &length))
+-                                        goto cleanup;
 +                                if (!get_partition_start_and_length(part,
 +                                                                    &start, &length))
-                                         goto cleanup;
++                                          goto cleanup;
                                  if (start == part->geom.start
  				    && length == part->geom.length)
-@@ -2643,7 +2670,7 @@
+                                         ok[i - 1] = 1;
+@@ -2643,7 +2702,7 @@
                          }
  
                          /* add the (possibly modified or new) partition */
@@ -79,7 +155,7 @@
                                  ped_exception_throw (
                                          PED_EXCEPTION_ERROR,
                                          PED_EXCEPTION_RETRY_CANCEL,
-@@ -2691,24 +2718,34 @@
+@@ -2691,24 +2750,34 @@
  
  #ifdef ENABLE_DEVICE_MAPPER
  static int
@@ -122,7 +198,7 @@
  }
  
  /* We consider a dm device that is a linear mapping with a  *
-@@ -2762,65 +2799,38 @@
+@@ -2762,65 +2831,38 @@
          return rc;
  }
  
@@ -211,7 +287,7 @@
  {
          char*           vol_name = NULL;
          const char*     dev_name = NULL;
-@@ -2873,7 +2883,7 @@
+@@ -2873,7 +2915,7 @@
                  free(vol_name);
                  return 1;
          } else {
@@ -220,7 +296,7 @@
          }
  err:
          dm_task_update_nodes();
-@@ -2883,34 +2893,6 @@
+@@ -2883,34 +2925,6 @@
          free (vol_name);
          return 0;
  }
@@ -255,7 +331,7 @@
  #endif
  
  static int
-@@ -2933,10 +2915,6 @@
+@@ -2933,10 +2947,6 @@
          if (!_has_partitions (disk))
                  return 1;
  

=== modified file 'debian/patches/udevadm-settle.patch'
--- debian/patches/udevadm-settle.patch	2012-01-13 19:49:30 +0000
+++ debian/patches/udevadm-settle.patch	2012-07-17 14:36:20 +0000
@@ -7,8 +7,6 @@
  This should be replaced by a proper completion-notification mechanism
  between the kernel and udev.
 
-Index: b/libparted/arch/linux.c
-===================================================================
 --- a/libparted/arch/linux.c
 +++ b/libparted/arch/linux.c
 @@ -26,6 +26,7 @@
@@ -19,7 +17,7 @@
  #include <ctype.h>
  #include <errno.h>
  #include <fcntl.h>
-@@ -2908,13 +2909,55 @@
+@@ -2940,13 +2941,55 @@
          return have_blkpg = kver >= KERNEL_VERSION (2,4,0) ? 1 : 0;
  }
  
@@ -75,7 +73,7 @@
          if (disk->dev->type != PED_DEVICE_FILE) {
  
  		/* We now require BLKPG support.  If this assertion fails,
-@@ -2924,10 +2967,20 @@
+@@ -2956,10 +2999,20 @@
  		assert (_have_blkpg ());
  
  		if (!_disk_sync_part_table (disk))