diff options
| author | Felix Janda <felix.janda@posteo.de> | 2015-05-03 10:33:15 +0200 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2015-06-22 12:57:47 -0700 |
| commit | 7e87ca3c531228d35e13e802d2622006138b104c (patch) | |
| tree | c022b4a8922d2f6e02f4edb77a646b4fe2fe44bb /libparted/arch/linux.c | |
| parent | 098bf9ca4c1ea7955ad683694c64f0201760de60 (diff) | |
| download | parted-7e87ca3c531228d35e13e802d2622006138b104c.tar.gz | |
libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER
Signed-off-by: Brian C. Lane <bcl@redhat.com>
Diffstat (limited to 'libparted/arch/linux.c')
| -rw-r--r-- | libparted/arch/linux.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index 90ab21d..f6141e4 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) return r < 0 ? NULL : resultp; } +#ifdef ENABLE_DEVICE_MAPPER static char * dm_canonical_path (PedDevice const *dev) { @@ -2326,14 +2327,21 @@ dm_canonical_path (PedDevice const *dev) err: return NULL; } +#endif static char* _device_get_part_path (PedDevice const *dev, int num) { - char *devpath = (dev->type == PED_DEVICE_DM - ? dm_canonical_path (dev) : dev->path); - size_t path_len = strlen (devpath); + char *devpath; + size_t path_len; char *result; +#ifdef ENABLE_DEVICE_MAPPER + devpath = (dev->type == PED_DEVICE_DM + ? dm_canonical_path (dev) : dev->path); +#else + devpath = dev->path; +#endif + path_len = strlen (devpath); /* Check for devfs-style /disc => /partN transformation unconditionally; the system might be using udev with devfs rules, and if not the test is harmless. */ @@ -2349,8 +2357,10 @@ _device_get_part_path (PedDevice const *dev, int num) ? "p" : ""); result = zasprintf ("%s%s%d", devpath, p, num); } +#ifdef ENABLE_DEVICE_MAPPER if (dev->type == PED_DEVICE_DM) free (devpath); +#endif return result; } @@ -2958,12 +2968,15 @@ _disk_sync_part_table (PedDisk* disk) unsigned long long *length); +#ifdef ENABLE_DEVICE_MAPPER if (disk->dev->type == PED_DEVICE_DM) { add_partition = _dm_add_partition; remove_partition = _dm_remove_partition; resize_partition = _dm_resize_partition; get_partition_start_and_length = _dm_get_partition_start_and_length; - } else { + } else +#endif + { add_partition = _blkpg_add_partition; remove_partition = _blkpg_remove_partition; #ifdef BLKPG_RESIZE_PARTITION |