starlingx/integ
Code Issues Proposed changes

upgrade parted to CentOS 7.5 version

Browse Source 
Most of changes in fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
are already in 7.5 version. So related changes removed.

Story: 2003389
Task: 24479
Depends-On: https://review.openstack.org/#/c/595981/

Change-Id: I92501a66ebb44eab92f4b7377998bb71d70fc722
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-08-24 19:30:39 +08:00
parent 3bfc1448da
commit d776a77304
6 changed files with 65 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem/parted/PKG-INFO
View File

@ -1,6 +1,6 @@
Metadata-Version: 1.1 Metadata-Version: 1.1
Name: parted Name: parted
Version: 2.0.21 Version: 3.1.29
Summary: Disk partition editing/resizing utility Summary: Disk partition editing/resizing utility
Home-page: Home-page:
Author: Author:

13
filesystem/parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +1,26 @@
From 74ab16d7e0c23b933b3d6f42eac63d70d07ab62d Mon Sep 17 00:00:00 2001 From 296b76674e19cfed71b77735f38c158b41a991b1 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com> From: Don Penney <don.penney@windriver.com>
Date: Tue, 27 Sep 2016 10:50:03 -0400 Date: Tue, 14 Aug 2018 02:57:08 +0800
Subject: [PATCH] Update package versioning for TIS format Subject: [PATCH] Update package versioning for TIS format
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
--- ---
SPECS/parted.spec | 2 +- SPECS/parted.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/parted.spec b/SPECS/parted.spec diff --git a/SPECS/parted.spec b/SPECS/parted.spec
index 644c2df..b79ca4a 100644 index 9316ebe..a79b888 100644
--- a/SPECS/parted.spec --- a/SPECS/parted.spec
+++ b/SPECS/parted.spec +++ b/SPECS/parted.spec
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program Summary: The GNU disk partition manipulation program
Name: parted Name: parted
Version: 3.1 Version: 3.1
-Release: 28%{?dist} -Release: 29%{?dist}
+Release: 28.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 29.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
URL: http://www.gnu.org/software/parted URL: http://www.gnu.org/software/parted
-- --
1.8.3.1 2.7.4

18
filesystem/parted/centos/meta_patches/0003-fix-dev-nodes-getting-removed-for-100-to-300-ms-on-p.patch
View File

@ -1,7 +1,7 @@
From cfa8f478bd19cf706f87c3c5a8baf54df7f2ea16 Mon Sep 17 00:00:00 2001 From 46b23c8cc8fffa24557cddf8507b8717c43b9171 Mon Sep 17 00:00:00 2001
From: Ovidiu Poncea <ovidiu.poncea@windriver.com> From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
Date: Fri, 2 Mar 2018 17:22:52 +0200 Date: Fri, 2 Mar 2018 17:22:52 +0200
Subject: [PATCH] Subject: [PATCH 3/3]
fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
--- ---
@ -9,10 +9,10 @@ Subject: [PATCH]
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/SPECS/parted.spec b/SPECS/parted.spec diff --git a/SPECS/parted.spec b/SPECS/parted.spec
index 6979b14..06a09f8 100644 index a79b888..f8c2969 100644
--- a/SPECS/parted.spec --- a/SPECS/parted.spec
+++ b/SPECS/parted.spec +++ b/SPECS/parted.spec
@@ -15,6 +15,7 @@ Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz @@ -13,6 +13,7 @@ Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source1: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source1: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
Source2: pubkey.jim.meyering Source2: pubkey.jim.meyering
Source3: resizepart.sh Source3: resizepart.sh
@ -20,14 +20,14 @@ index 6979b14..06a09f8 100644
Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch
Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch
@@ -64,6 +65,7 @@ Patch42: 0042-tests-Set-optimal-blocks-to-64-for-scsi_debug-device.patch @@ -67,6 +68,7 @@ Patch47: 0047-tests-excersise-resize-command.patch
Patch48: 0048-parted-add-resizepart-command.patch
# WRS # WRS
Patch43: syscalls.patch Patch49: syscalls.patch
+Patch44: fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch +Patch50: fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
-- --
1.9.1 2.7.4

31
filesystem/parted/centos/meta_patches/syscalls.patch
View File

@ -1,14 +1,14 @@
From 4859fab94b298a4ca449216c3035b8b024c661a3 Mon Sep 17 00:00:00 2001 From 58d86a82323f838bb6169423fb3dd958bb92c147 Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com> From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Wed, 21 Dec 2016 15:28:53 -0500 Date: Wed, 21 Dec 2016 15:28:53 -0500
Subject: [PATCH 1/2] WRS: syscalls.patch Subject: [PATCH 1/3] WRS: syscalls.patch
--- ---
SPECS/parted.spec | 12 +++++++++++- SPECS/parted.spec | 11 ++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/SPECS/parted.spec b/SPECS/parted.spec diff --git a/SPECS/parted.spec b/SPECS/parted.spec
index 749687f..644c2df 100644 index 1f453cb..9316ebe 100644
--- a/SPECS/parted.spec --- a/SPECS/parted.spec
+++ b/SPECS/parted.spec +++ b/SPECS/parted.spec
@@ -12,6 +12,7 @@ URL: http://www.gnu.org/software/parted @@ -12,6 +12,7 @@ URL: http://www.gnu.org/software/parted
@ -19,17 +19,16 @@ index 749687f..644c2df 100644
Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch
Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch
@@ -59,6 +60,9 @@ Patch40: 0040-partprobe-Open-the-device-once-for-probing-1339705.patch @@ -64,6 +65,8 @@ Patch45: 0045-parted-Add-stub-resize-command-for-backward-compatib.patch
Patch41: 0041-tests-Stop-timing-t9040-1172675.patch Patch46: 0046-libparted-Backport-partition-resize-code.patch
Patch42: 0042-tests-Set-optimal-blocks-to-64-for-scsi_debug-device.patch Patch47: 0047-tests-excersise-resize-command.patch
Patch48: 0048-parted-add-resizepart-command.patch
+# WRS +# WRS
+Patch43: syscalls.patch +Patch49: syscalls.patch
+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: readline-devel @@ -128,7 +131,7 @@ git commit -a -m "run iconv"
@@ -121,7 +125,7 @@ git commit -a -m "run iconv"
autoreconf autoreconf
autoconf autoconf
CFLAGS="$RPM_OPT_FLAGS -Wno-unused-but-set-variable"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS -Wno-unused-but-set-variable"; export CFLAGS
@ -38,7 +37,7 @@ index 749687f..644c2df 100644
# Don't use rpath! # Don't use rpath!
%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -150,6 +154,9 @@ popd @@ -157,6 +160,9 @@ popd
%find_lang %{name} %find_lang %{name}
@ -48,7 +47,7 @@ index 749687f..644c2df 100644
%check %check
export LD_LIBRARY_PATH=$(pwd)/libparted/.libs export LD_LIBRARY_PATH=$(pwd)/libparted/.libs
@@ -185,6 +192,9 @@ fi @@ -192,6 +198,9 @@ fi
%{_libdir}/libparted-fs-resize.so* %{_libdir}/libparted-fs-resize.so*
%{_infodir}/parted.info.gz %{_infodir}/parted.info.gz
@ -59,5 +58,5 @@ index 749687f..644c2df 100644
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_includedir}/parted %{_includedir}/parted
-- --
1.8.3.1 2.7.4

673
filesystem/parted/centos/patches/fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
View File

@ -1,4 +1,4 @@
From 9e7ad12a13665d975ddb9ee4669f781a1a695f8a Mon Sep 17 00:00:00 2001 From 2fc5cefc48c294b25dbd5dc1e533c7d12508289a Mon Sep 17 00:00:00 2001
From: Phillip Susi <psusi@ubuntu.com> From: Phillip Susi <psusi@ubuntu.com>
Date: Sun, 14 Oct 2012 23:59:58 -0400 Date: Sun, 14 Oct 2012 23:59:58 -0400
Subject: [PATCH] 'parted -s <dev_node> print' causes device nodes to be Subject: [PATCH] 'parted -s <dev_node> print' causes device nodes to be
@ -102,20 +102,20 @@ a device node that did not actually exist.
Conflicts: Conflicts:
NEWS NEWS
--- ---
NEWS | 94 +++++- NEWS | 94 +++++++++++++++++++++++++++++++--
libparted/arch/linux.c | 565 +++++++++++++++----------------- libparted/arch/linux.c | 24 +++++----
tests/Makefile.am | 2 + tests/Makefile.am | 2 +
tests/t1104-remove-and-add-partition.sh | 50 +++ tests/t1104-remove-and-add-partition.sh | 50 ++++++++++++++++++
tests/t6010-dm-busy.sh | 92 ++++++ tests/t6010-dm-busy.sh | 92 ++++++++++++++++++++++++++++++++
5 files changed, 499 insertions(+), 304 deletions(-) 5 files changed, 249 insertions(+), 13 deletions(-)
create mode 100644 tests/t1104-remove-and-add-partition.sh create mode 100644 tests/t1104-remove-and-add-partition.sh
create mode 100644 tests/t6010-dm-busy.sh create mode 100644 tests/t6010-dm-busy.sh
diff --git a/NEWS b/NEWS diff --git a/NEWS b/NEWS
index d1ab2a6..42ee12c 100644 index 62d6381..c78ee9e 100644
--- a/NEWS --- a/NEWS
+++ b/NEWS +++ b/NEWS
@@ -2,10 +2,98 @@ GNU parted NEWS -*- outline -*- @@ -7,10 +7,98 @@ GNU parted NEWS -*- outline -*-
* Noteworthy changes in release 3.1-18 (2014-08-12) [RHEL7.1] * Noteworthy changes in release 3.1-18 (2014-08-12) [RHEL7.1]
@ -218,7 +218,7 @@ index d1ab2a6..42ee12c 100644
* Noteworthy changes in release 3.1-16 (2014-01-22) [RHEL7] * Noteworthy changes in release 3.1-16 (2014-01-22) [RHEL7]
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 67a5c2e..adb82f2 100644 index 27f706b..de63118 100644
--- a/libparted/arch/linux.c --- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c +++ b/libparted/arch/linux.c
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
@ -229,21 +229,16 @@ index 67a5c2e..adb82f2 100644
#if ENABLE_NLS #if ENABLE_NLS
# include <libintl.h> # include <libintl.h>
@@ -285,11 +286,12 @@ struct blkdev_ioctl_param { @@ -286,7 +287,7 @@ struct blkdev_ioctl_param {
/* Maximum number of partitions supported by linux. */ /* Maximum number of partitions supported by linux. */
#define MAX_NUM_PARTS 64 #define MAX_NUM_PARTS 64
-static char* _device_get_part_path (PedDevice* dev, int num); -static char* _device_get_part_path (PedDevice* dev, int num);
+static char* _device_get_part_path (PedDevice const *dev, int num); +static char* _device_get_part_path (PedDevice const *dev, int num);
static int _partition_is_mounted_by_path (const char* path); static int _partition_is_mounted_by_path (const char* path);
static unsigned int _device_get_partition_range(PedDevice const* dev);
static int _device_open (PedDevice* dev, int flags); static int _device_open (PedDevice* dev, int flags);
static int _device_open_ro (PedDevice* dev); @@ -1521,8 +1522,8 @@ linux_is_busy (PedDevice* dev)
static int _device_close (PedDevice* dev);
+static unsigned int _device_get_partition_range(PedDevice const* dev);
static int
_read_fd (int fd, char **buf)
@@ -1495,8 +1497,8 @@ linux_is_busy (PedDevice* dev)
return 0; return 0;
} }
@ -254,109 +249,46 @@ index 67a5c2e..adb82f2 100644
* We should only flush unmounted partition devices, because: * We should only flush unmounted partition devices, because:
* - there is never a need to flush them (we're not doing IO there) * - there is never a need to flush them (we're not doing IO there)
* - flushing a device that is mounted causes unnecessary IO, and can * - flushing a device that is mounted causes unnecessary IO, and can
@@ -1507,6 +1509,7 @@ _flush_cache (PedDevice* dev) @@ -1542,9 +1543,6 @@ _flush_cache (PedDevice* dev)
{
LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev);
int i;
+ int lpn = _device_get_partition_range(dev);
if (dev->read_only)
return;
@@ -1514,11 +1517,7 @@ _flush_cache (PedDevice* dev)
ioctl (arch_specific->fd, BLKFLSBUF); ioctl (arch_specific->fd, BLKFLSBUF);
- /* With linux-2.6.0 and newer, we're done. */ /* With linux-2.6.0 and newer, we're done. */
- if (_have_kern26()) - if (_have_kern26())
- return; - return;
- -
- for (i = 1; i < 16; i++) { for (i = 1; i < lpn; i++) {
+ for (i = 1; i < lpn; i++) {
char* name; char* name;
int fd; int fd;
@@ -2318,7 +2316,7 @@ err:
#endif
@@ -2265,34 +2264,72 @@ zasprintf (const char *format, ...) static char*
return r < 0 ? NULL : resultp;
}
-static char*
-_device_get_part_path (PedDevice *dev, int num) -_device_get_part_path (PedDevice *dev, int num)
+#ifdef ENABLE_DEVICE_MAPPER
+static char *
+dm_canonical_path (PedDevice const *dev)
{
- size_t path_len = strlen (dev->path);
+ LinuxSpecific const *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;
+ char *dev_name = zasprintf ("/dev/mapper/%s", dm_task_get_name (task));
+ if (dev_name == NULL)
+ goto err;
+ dm_task_destroy (task);
+ return dev_name;
+err:
+ return NULL;
+}
+#endif
+
+static char*
+_device_get_part_path (PedDevice const *dev, int num) +_device_get_part_path (PedDevice const *dev, int num)
+{ {
+ char *devpath; char *devpath;
+ size_t path_len; size_t path_len;
char *result; @@ -2341,7 +2339,7 @@ _device_get_part_path (PedDevice *dev, int num)
+#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. */
- if (5 < path_len && !strcmp (dev->path + path_len - 5, "/disc")) {
+ if (5 < path_len && !strcmp (devpath + path_len - 5, "/disc")) {
/* replace /disc with /part%d */
result = zasprintf ("%.*s/part%d",
- (int) (path_len - 5), dev->path, num);
+ (int) (path_len - 5), devpath, num);
} else {
char const *p = (dev->type == PED_DEVICE_DAC960 char const *p = (dev->type == PED_DEVICE_DAC960
|| dev->type == PED_DEVICE_CPQARRAY || dev->type == PED_DEVICE_CPQARRAY
|| dev->type == PED_DEVICE_ATARAID || dev->type == PED_DEVICE_ATARAID
- || isdigit (dev->path[path_len - 1]) - || isdigit (dev->path[path_len - 1])
+ || isdigit (devpath[path_len - 1]) + || isdigit (devpath[path_len - 1])
? "p" : ""); ? "p" : "");
- result = zasprintf ("%s%s%d", dev->path, p, num); result = zasprintf ("%s%s%d", devpath, p, num);
+ result = zasprintf ("%s%s%d", devpath, p, num);
} }
- @@ -2355,6 +2353,10 @@ _device_get_part_path (PedDevice *dev, int num)
+#ifdef ENABLE_DEVICE_MAPPER
+ if (dev->type == PED_DEVICE_DM)
+ free (devpath);
+#endif
return result;
}
static char* static char*
linux_partition_get_path (const PedPartition* part) linux_partition_get_path (const PedPartition* part)
{ {
+ /* loop label means use the whole disk */ + /* loop label means use the whole disk */
+ if (strcmp (part->disk->type->name, "loop") == 0) + if (strcmp (part->disk->type->name, "loop") == 0)
+ return xstrdup (part->disk->dev->path); + return xstrdup (part->disk->dev->path);
+
return _device_get_part_path (part->disk->dev, part->num); return _device_get_part_path (part->disk->dev, part->num);
} }
@@ -2361,6 +2398,8 @@ linux_partition_is_busy (const PedPartition* part) @@ -2423,6 +2425,8 @@ linux_partition_is_busy (const PedPartition* part)
PED_ASSERT (part != NULL); PED_ASSERT (part != NULL);
@ -365,7 +297,7 @@ index 67a5c2e..adb82f2 100644
if (_partition_is_mounted (part)) if (_partition_is_mounted (part))
return 1; return 1;
if (part->type == PED_PARTITION_EXTENDED) { if (part->type == PED_PARTITION_EXTENDED) {
@@ -2494,7 +2533,7 @@ _sysfs_ull_entry_from_part(PedPartition const* part, const char *entry, @@ -2602,7 +2606,7 @@ _sysfs_ull_entry_from_part(PedPartition const* part, const char *entry,
unsigned long long *val) unsigned long long *val)
{ {
char path[128]; char path[128];
@ -374,7 +306,7 @@ index 67a5c2e..adb82f2 100644
if (!part_name) if (!part_name)
return false; return false;
@@ -2529,7 +2568,7 @@ _kernel_get_partition_start_and_length(PedPartition const *part, @@ -2637,7 +2641,7 @@ _kernel_get_partition_start_and_length(PedPartition const *part,
PED_ASSERT(start); PED_ASSERT(start);
PED_ASSERT(length); PED_ASSERT(length);
@ -383,549 +315,8 @@ index 67a5c2e..adb82f2 100644
if (!dev_name) if (!dev_name)
return false; return false;
@@ -2583,6 +2622,8 @@ static unsigned int
_device_get_partition_range(PedDevice const* dev)
{
int range;
+ if (dev->type == PED_DEVICE_DM)
+ return MAX_NUM_PARTS;
bool ok = _sysfs_int_entry_from_dev(dev, "ext_range", &range);
if (!ok)
@@ -2591,6 +2632,133 @@ _device_get_partition_range(PedDevice const* dev)
return range > 1 ? range : 0;
}
+#ifdef ENABLE_DEVICE_MAPPER
+static int
+_dm_remove_partition(PedDisk* disk, int partno)
+{
+ int rc;
+ char *part_name = _device_get_part_path (disk->dev, partno);
+
+ int fd = open (part_name, O_RDONLY | O_EXCL);
+ if (fd == -1) {
+ if (errno == ENOENT)
+ errno = ENXIO; /* nothing to remove, device already doesn't exist */
+ free (part_name);
+ return 0;
+ }
+ close (fd);
+ struct dm_task *task = dm_task_create(DM_DEVICE_REMOVE);
+ if (!task) {
+ free (part_name);
+ return 0;
+ }
+ dm_task_set_name (task, part_name);
+ rc = dm_task_run(task);
+ dm_task_update_nodes();
+ dm_task_destroy(task);
+ free (part_name);
+ if (!rc)
+ return 0;
+
+ return 1;
+}
+
+static bool
+_dm_get_partition_start_and_length(PedPartition const *part,
+ unsigned long long *start,
+ unsigned long long *length)
+{
+ struct dm_task* task = NULL;
+ int rc = 0;
+
+ if (!(task = dm_task_create(DM_DEVICE_TABLE)))
+ return 0;
+ char *path = _device_get_part_path (part->disk->dev, part->num);
+ PED_ASSERT(path);
+ /* libdevmapper likes to complain on stderr instead of quietly
+ returning ENOENT or ENXIO, so try to stat first */
+ struct stat st;
+ if (stat(path, &st))
+ goto err;
+ dm_task_set_name(task, path);
+ if (!dm_task_run(task))
+ goto err;
+
+ int major, minor;
+ char *params;
+ char *target_type;
+ dm_get_next_target(task, NULL, (uint64_t *)start, (uint64_t *)length, &target_type, &params);
+ if (sscanf (params, "%d:%d %Ld", &major, &minor, start) != 3)
+ goto err;
+ rc = 1;
+err:
+ free (path);
+ dm_task_destroy(task);
+ return rc;
+}
+
+
+static int
+_dm_add_partition (PedDisk* disk, const PedPartition* part)
+{
+ LinuxSpecific* arch_specific = LINUX_SPECIFIC (disk->dev);
+ char *params = NULL;
+ char *vol_name = NULL;
+
+ /* 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;
+
+ const char *dev_name = dm_task_get_name (task);
+ size_t name_len = strlen (dev_name);
+ vol_name = zasprintf ("%s%s%d",
+ dev_name,
+ isdigit (dev_name[name_len - 1]) ? "p" : "",
+ part->num);
+ if (vol_name == NULL)
+ goto err;
+
+ /* Caution: dm_task_destroy frees dev_name. */
+ dm_task_destroy (task);
+ task = NULL;
+ if ( ! (params = zasprintf ("%d:%d %lld", arch_specific->major,
+ arch_specific->minor, part->geom.start)))
+ goto err;
+
+ task = dm_task_create (DM_DEVICE_CREATE);
+ if (!task)
+ goto err;
+
+ dm_task_set_name (task, vol_name);
+ dm_task_add_target (task, 0, part->geom.length,
+ "linear", params);
+ if (dm_task_run (task)) {
+ dm_task_update_nodes ();
+ dm_task_destroy (task);
+ free (params);
+ free (vol_name);
+ return 1;
+ } else {
+ _dm_remove_partition (disk, part->num);
+ }
+err:
+ dm_task_update_nodes();
+ if (task)
+ dm_task_destroy (task);
+ free (params);
+ free (vol_name);
+ return 0;
+}
+#endif
+
/*
* Sync the partition table in two step process:
* 1. Remove all of the partitions from the kernel's tables, but do not attempt
@@ -2611,12 +2779,31 @@ _disk_sync_part_table (PedDisk* disk)
PED_ASSERT(disk != NULL);
PED_ASSERT(disk->dev != NULL);
int lpn;
-
unsigned int part_range = _device_get_partition_range(disk->dev);
+ int (*add_partition)(PedDisk* disk, const PedPartition *part);
+ int (*remove_partition)(PedDisk* disk, int partno);
+ bool (*get_partition_start_and_length)(PedPartition const *part,
+ unsigned long long *start,
+ unsigned long long *length);
+
- /* lpn = largest partition number. */
+#ifdef ENABLE_DEVICE_MAPPER
+ if (disk->dev->type == PED_DEVICE_DM) {
+ add_partition = _dm_add_partition;
+ remove_partition = _dm_remove_partition;
+ get_partition_start_and_length = _dm_get_partition_start_and_length;
+ } else
+#endif
+ {
+ add_partition = _blkpg_add_partition;
+ remove_partition = _blkpg_remove_partition;
+ get_partition_start_and_length = _kernel_get_partition_start_and_length;
+ }
+
+ /* lpn = largest partition number.
+ * for remove pass, use greater of device or label limit */
if (ped_disk_get_max_supported_partition_count(disk, &lpn))
- lpn = PED_MIN(lpn, part_range);
+ lpn = PED_MAX(lpn, part_range);
else
lpn = part_range;
@@ -2633,59 +2820,68 @@ _disk_sync_part_table (PedDisk* disk)
if (!errnums)
goto cleanup;
- /* 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 n_sleep = (max_sleep_seconds
- * 1000000 / sleep_microseconds);
int i;
- for (i = 0; i < n_sleep; i++) {
- if (i)
- usleep (sleep_microseconds);
- bool busy = false;
- int j;
- for (j = 0; j < lpn; j++) {
- if (!ok[j]) {
- ok[j] = _blkpg_remove_partition (disk, j + 1);
- errnums[j] = errno;
- if (!ok[j] && errnums[j] == EBUSY)
- busy = true;
- }
- }
- if (!busy)
- break;
- }
-
+ /* remove old partitions first */
for (i = 1; i <= lpn; i++) {
PedPartition *part = ped_disk_get_partition (disk, i);
if (part) {
- if (!ok[i - 1] && errnums[i - 1] == EBUSY) {
- 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 (start == part->geom.start
- && length == part->geom.length)
- ok[i - 1] = 1;
- /* If the new partition is unchanged and the
- existing one was not removed because it was
- in use, then reset the error flag and do not
- try to add it since it is already there. */
+ unsigned long long length;
+ unsigned long long start;
+ /* get start and length of existing partition */
+ if (get_partition_start_and_length(part,
+ &start, &length)
+ && start == part->geom.start
+ && length == part->geom.length)
+ {
+ /* partition is unchanged, so nothing to do */
+ ok[i - 1] = 1;
continue;
}
-
- /* add the (possibly modified or new) partition */
- if (!_blkpg_add_partition (disk, part)) {
- ped_exception_throw (
- PED_EXCEPTION_ERROR,
- PED_EXCEPTION_RETRY_CANCEL,
- _("Failed to add partition %d (%s)"),
- i, strerror (errno));
- goto cleanup;
- }
+ }
+ /* Attempt to remove the 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 n_sleep = (max_sleep_seconds
+ * 1000000 / sleep_microseconds);
+ do {
+ ok[i - 1] = remove_partition (disk, i);
+ errnums[i - 1] = errno;
+ if (ok[i - 1] || errnums[i - 1] != EBUSY)
+ break;
+ usleep (sleep_microseconds);
+ } while (n_sleep--);
+ if (!ok[i - 1] && errnums[i - 1] == ENXIO)
+ ok[i - 1] = 1; /* it already doesn't exist */
+ }
+ /* lpn = largest partition number.
+ * for add pass, use lesser of device or label limit */
+ if (ped_disk_get_max_supported_partition_count(disk, &lpn))
+ lpn = PED_MIN(lpn, part_range);
+ else
+ lpn = part_range;
+ /* don't actually add partitions for loop */
+ if (strcmp (disk->type->name, "loop") == 0)
+ lpn = 0;
+ for (i = 1; i <= lpn; i++) {
+ PedPartition *part = ped_disk_get_partition (disk, i);
+ if (!part)
+ continue;
+ unsigned long long length;
+ unsigned long long start;
+ /* get start and length of existing partition */
+ if (get_partition_start_and_length(part,
+ &start, &length)
+ && start == part->geom.start
+ && length == part->geom.length) {
+ ok[i - 1] = 1;
+ /* partition is unchanged, so nothing to do */
+ continue;
+ }
+ /* add the (possibly modified or new) partition */
+ if (!add_partition (disk, part)) {
+ ok[i - 1] = 0;
+ errnums[i - 1] = errno;
}
}
@@ -2724,235 +2920,6 @@ _disk_sync_part_table (PedDisk* disk)
return ret;
}
-#ifdef ENABLE_DEVICE_MAPPER
-static int
-_dm_remove_map_name(char *name)
-{
- struct dm_task *task = NULL;
- int rc = 0;
- uint32_t cookie = 0;
-
- task = dm_task_create(DM_DEVICE_REMOVE);
- if (!task)
- return 1;
-
- dm_task_set_name (task, name);
- if (!dm_task_set_cookie(task, &cookie, 0))
- goto err;
-
- rc = dm_task_run(task);
- dm_udev_wait(cookie);
- dm_task_update_nodes();
-err:
- dm_task_destroy(task);
- if (!rc)
- return 1;
-
- return 0;
-}
-
-static int
-_dm_is_part (struct dm_info *this, char *name)
-{
- struct dm_task* task = NULL;
- struct dm_info* info = alloca(sizeof *info);
- struct dm_deps* deps = NULL;
- int rc = 0;
- unsigned int i;
-
- task = dm_task_create(DM_DEVICE_DEPS);
- if (!task)
- return 0;
-
- dm_task_set_name(task, name);
- if (!dm_task_run(task))
- goto err;
-
- memset(info, '\0', sizeof *info);
- dm_task_get_info(task, info);
- if (!info->exists)
- goto err;
-
- deps = dm_task_get_deps(task);
- if (!deps)
- goto err;
-
- for (i = 0; i < deps->count; i++) {
- unsigned int ma = major(deps->device[i]),
- mi = minor(deps->device[i]);
-
- if (ma == this->major && mi == this->minor)
- rc = 1;
- }
-
-err:
- dm_task_destroy(task);
- return rc;
-}
-
-static int
-_dm_remove_parts (PedDevice* dev)
-{
- struct dm_task* task = NULL;
- struct dm_info* info = alloca(sizeof *info);
- struct dm_names* names = NULL;
- unsigned int next = 0;
- int rc;
- LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev);
-
- task = dm_task_create(DM_DEVICE_LIST);
- 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;
-
- memset(info, '\0', sizeof *info);
- dm_task_get_info(task, info);
- if (!info->exists)
- goto err;
-
- names = dm_task_get_names(task);
- if (!names)
- goto err;
-
- rc = 0;
- do {
- names = (void *) ((char *) names + next);
-
- if (_dm_is_part(info, names->name))
- rc += _dm_remove_map_name(names->name);
-
- next = names->next;
- } while (next);
-
- dm_task_update_nodes();
- dm_task_destroy(task);
- task = NULL;
-
- if (!rc)
- return 1;
-err:
- if (task)
- dm_task_destroy(task);
- ped_exception_throw (PED_EXCEPTION_WARNING, PED_EXCEPTION_IGNORE,
- _("parted was unable to re-read the partition "
- "table on %s (%s). This means Linux won't know "
- "anything about the modifications you made. "),
- dev->path, strerror (errno));
- return 0;
-}
-
-static int
-_dm_add_partition (PedDisk* disk, PedPartition* part)
-{
- char* vol_name = NULL;
- const char* dev_name = NULL;
- char* vol_uuid = NULL;
- const char* dev_uuid = NULL;
- char* params = NULL;
- LinuxSpecific* arch_specific = LINUX_SPECIFIC (disk->dev);
- uint32_t cookie = 0;
-
- /* 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 = dm_task_get_name (task);
- dev_uuid = dm_task_get_uuid (task);
-
- if (isdigit (dev_name[strlen (dev_name) - 1])) {
- if ( ! (vol_name = zasprintf ("%sp%d", dev_name, part->num)))
- goto err;
- } else if ( ! (vol_name = zasprintf ("%s%d", dev_name, part->num)))
- goto err;
-
- if ( dev_uuid && (strlen(dev_uuid) > 0) \
- && ! (vol_uuid = zasprintf ("part%d-%s", part->num, dev_uuid)))
- goto err;
-
- /* Caution: dm_task_destroy frees dev_name. */
- dm_task_destroy (task);
- task = NULL;
-
- /* device-mapper uses 512b units, not the device's sector size */
- if ( ! (params = zasprintf ("%d:%d %lld", arch_specific->major,
- arch_specific->minor,
- part->geom.start * (disk->dev->sector_size / PED_SECTOR_SIZE_DEFAULT))))
- goto err;
-
- task = dm_task_create (DM_DEVICE_CREATE);
- if (!task)
- goto err;
-
- dm_task_set_name (task, vol_name);
- if (vol_uuid)
- dm_task_set_uuid (task, vol_uuid);
- /* device-mapper uses 512b units, not the device's sector size */
- dm_task_add_target (task, 0, part->geom.length * (disk->dev->sector_size / PED_SECTOR_SIZE_DEFAULT),
- "linear", params);
- if (!dm_task_set_cookie(task, &cookie, 0))
- goto err;
- if (dm_task_run (task)) {
- //printf("0 %ld linear %s\n", part->geom.length, params);
- dm_udev_wait(cookie);
- dm_task_update_nodes();
- dm_task_destroy(task);
- free(params);
- free(vol_uuid);
- free(vol_name);
- return 1;
- } else {
- dm_udev_wait(cookie);
- _dm_remove_map_name(vol_name);
- }
-err:
- dm_task_update_nodes();
- if (task)
- dm_task_destroy (task);
- free (params);
- free (vol_uuid);
- free (vol_name);
- return 0;
-}
-
-static int
-_dm_reread_part_table (PedDisk* disk)
-{
- int largest_partnum = ped_disk_get_last_partition_num (disk);
- int rc = 1;
- int i;
-
- sync();
- if (!_dm_remove_parts(disk->dev))
- rc = 0;
-
- for (i = 1; i <= largest_partnum; i++) {
- PedPartition* part;
-
- part = ped_disk_get_partition (disk, i);
- if (!part)
- continue;
-
- if (!_dm_add_partition (disk, part))
- rc = 0;
- }
- return rc;
-}
-#endif
-
static int
_have_blkpg ()
{
@@ -2970,10 +2937,6 @@ _have_blkpg ()
static int
linux_disk_commit (PedDisk* disk)
{
-#ifdef ENABLE_DEVICE_MAPPER
- if (disk->dev->type == PED_DEVICE_DM)
- return _dm_reread_part_table (disk);
-#endif
if (disk->dev->type != PED_DEVICE_FILE) {
/* We now require BLKPG support. If this assertion fails,
diff --git a/tests/Makefile.am b/tests/Makefile.am diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1cf859c..44518c8 100644 index 29fa280..ac8122b 100644
--- a/tests/Makefile.am --- a/tests/Makefile.am
+++ b/tests/Makefile.am +++ b/tests/Makefile.am
@@ -34,6 +34,7 @@ TESTS = \ @@ -34,6 +34,7 @@ TESTS = \
@ -936,7 +327,7 @@ index 1cf859c..44518c8 100644
t1700-probe-fs.sh \ t1700-probe-fs.sh \
t2200-dos-label-recog.sh \ t2200-dos-label-recog.sh \
t2201-pc98-label-recog.sh \ t2201-pc98-label-recog.sh \
@@ -58,6 +59,7 @@ TESTS = \ @@ -59,6 +60,7 @@ TESTS = \
t6002-dm-many-partitions.sh \ t6002-dm-many-partitions.sh \
t6003-dm-uuid.sh \ t6003-dm-uuid.sh \
t6004-dm-512b-sectors.sh \ t6004-dm-512b-sectors.sh \
@ -1099,5 +490,5 @@ index 0000000..9807b40
+ +
+Exit $fail +Exit $fail
-- --
1.9.1 2.7.4

2
filesystem/parted/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/parted-3.1-28.el7.src.rpm mirror:Source/parted-3.1-29.el7.src.rpm