wok annotate parted/stuff/device_mapper.u @ rev 18795
vte: fix alt-key patch. xterm: use smaller libxaw3D
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Fri Jan 08 07:16:21 2016 +0000 (2016-01-08) |
parents | |
children |
rev | line source |
---|---|
pascal@17545 | 1 --- parted-3.2/libparted/arch/linux.c.device-mapper 2014-06-15 20:15:54.000000000 +0100 |
pascal@17545 | 2 +++ parted-3.2/libparted/arch/linux.c 2014-07-29 22:27:54.487430030 +0100 |
pascal@17545 | 3 @@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...) |
pascal@17545 | 4 static char * |
pascal@17545 | 5 dm_canonical_path (PedDevice const *dev) |
pascal@17545 | 6 { |
pascal@17545 | 7 +#ifdef ENABLE_DEVICE_MAPPER |
pascal@17545 | 8 LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); |
pascal@17545 | 9 |
pascal@17545 | 10 /* Get map name from devicemapper */ |
pascal@17545 | 11 @@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev) |
pascal@17545 | 12 dm_task_destroy (task); |
pascal@17545 | 13 return dev_name; |
pascal@17545 | 14 err: |
pascal@17545 | 15 +#endif |
pascal@17545 | 16 return NULL; |
pascal@17545 | 17 } |
pascal@17545 | 18 |
pascal@17545 | 19 @@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk) |
pascal@17545 | 20 unsigned long long *start, |
pascal@17545 | 21 unsigned long long *length); |
pascal@17545 | 22 |
pascal@17545 | 23 - |
pascal@17545 | 24 +#ifdef ENABLE_DEVICE_MAPPER |
pascal@17545 | 25 if (disk->dev->type == PED_DEVICE_DM) { |
pascal@17545 | 26 add_partition = _dm_add_partition; |
pascal@17545 | 27 remove_partition = _dm_remove_partition; |
pascal@17545 | 28 resize_partition = _dm_resize_partition; |
pascal@17545 | 29 get_partition_start_and_length = _dm_get_partition_start_and_length; |
pascal@17545 | 30 } else { |
pascal@17545 | 31 +#endif |
pascal@17545 | 32 add_partition = _blkpg_add_partition; |
pascal@17545 | 33 remove_partition = _blkpg_remove_partition; |
pascal@17545 | 34 #ifdef BLKPG_RESIZE_PARTITION |
pascal@17545 | 35 @@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk) |
pascal@17545 | 36 resize_partition = NULL; |
pascal@17545 | 37 #endif |
pascal@17545 | 38 get_partition_start_and_length = _kernel_get_partition_start_and_length; |
pascal@17545 | 39 +#ifdef ENABLE_DEVICE_MAPPER |
pascal@17545 | 40 } |
pascal@17545 | 41 +#endif |
pascal@17545 | 42 |
pascal@17545 | 43 /* lpn = largest partition number. |
pascal@17545 | 44 * for remove pass, use greater of device or label limit */ |