summaryrefslogtreecommitdiffstats
path: root/0014-RH-dm_reassign.patch
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@redhat.com>2013-03-02 17:03:30 -0600
committerBenjamin Marzinski <bmarzins@redhat.com>2013-03-02 17:03:30 -0600
commitd1207a7795f6efc52e321e735a92d7b3d80aaaba (patch)
treebb53dfc9c74896fe5467159dfb92a4fdf774f492 /0014-RH-dm_reassign.patch
parent1a1eabcadfe8159ec0373b7a4cf7b2e058ea0db5 (diff)
downloaddevice-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.gz
device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.xz
device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.zip
device-mapper-multipath-0.4.9-45
Updated to latest upstrem 0.4.9 code: multipath-tools-130222 (git commit id: 67b82ad6fe280caa1770025a6bb8110b633fa136) Refresh 0001-RH-dont_start_with_no_config.patch Modify 0002-RH-multipath.rules.patch Modify 0003-RH-Make-build-system-RH-Fedora-friendly.patch Refresh 0004-RH-multipathd-blacklist-all-by-default.patch Refresh 0005-RH-add-mpathconf.patch Refresh 0006-RH-add-find-multipaths.patch Add 0008-RH-revert-partition-changes.patch Rename 0008-RH-RHEL5-style-partitions.patch to 0009-RH-RHEL5-style-partitions.patch Rename 0009-RH-dont-remove-map-on-enomem.patch to 0010-RH-dont-remove-map-on-enomem.patch Rename 0010-RH-deprecate-uid-gid-mode.patch to 0011-RH-deprecate-uid-gid-mode.patch Rename 0013-RH-kpartx-msg.patch to 0012-RH-kpartx-msg.patch Rename 0035-RHBZ-883981-cleanup-rpmdiff-issues.patch to 0013-RHBZ-883981-cleanup-rpmdiff-issues.patch Rename 0039-RH-handle-other-sector-sizes.patch to 0014-RH-handle-other-sector-sizes.patch Rename 0040-RH-fix-output-buffer.patch to 0015-RH-fix-output-buffer.patch Add 0016-RH-dont-print-ghost-messages.patch Add 0017-RH-fix-sigusr1.patch * Actually this fixes a number of issues related to signals Rename 0018-RH-remove-config-dups.patch to 0018-RH-fix-factorize.patch * just the part that isn't upstream Add 0019-RH-fix-sockets.patch * makes abstract multipathd a cli sockets use the correct name. Set find_multipaths in the default config
Diffstat (limited to '0014-RH-dm_reassign.patch')
-rw-r--r--0014-RH-dm_reassign.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/0014-RH-dm_reassign.patch b/0014-RH-dm_reassign.patch
deleted file mode 100644
index a66b93c..0000000
--- a/0014-RH-dm_reassign.patch
+++ /dev/null
@@ -1,80 +0,0 @@
----
- libmultipath/devmapper.c | 4 +++-
- libmultipath/sysfs.c | 10 ++++++----
- libmultipath/util.c | 3 ++-
- 3 files changed, 11 insertions(+), 6 deletions(-)
-
-Index: multipath-tools-120821/libmultipath/devmapper.c
-===================================================================
---- multipath-tools-120821.orig/libmultipath/devmapper.c
-+++ multipath-tools-120821/libmultipath/devmapper.c
-@@ -1372,8 +1372,10 @@ int dm_reassign(const char *mapname)
- return 1;
- }
-
-- if (!(dmt = dm_task_create(DM_DEVICE_DEPS)))
-+ if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
-+ condlog(3, "%s: couldn't make dm task", mapname);
- return 0;
-+ }
-
- if (!dm_task_set_name(dmt, mapname))
- goto out;
-Index: multipath-tools-120821/libmultipath/sysfs.c
-===================================================================
---- multipath-tools-120821.orig/libmultipath/sysfs.c
-+++ multipath-tools-120821/libmultipath/sysfs.c
-@@ -125,8 +125,10 @@ int sysfs_check_holders(char * check_dev
- return 0;
- }
-
-- if (devt2devname(check_dev, PATH_SIZE, check_devt))
-+ if (devt2devname(check_dev, PATH_SIZE, check_devt)) {
-+ condlog(1, "can't get devname for %s", check_devt);
- return 0;
-+ }
-
- condlog(3, "%s: checking holder", check_dev);
-
-@@ -143,17 +145,17 @@ int sysfs_check_holders(char * check_dev
- continue;
-
- if (sscanf(holder->d_name, "dm-%d", &table_minor) != 1) {
-- condlog(3, "%s: %s is not a dm-device",
-+ condlog(0, "%s: %s is not a dm-device",
- check_dev, holder->d_name);
- continue;
- }
- if (table_minor == new_minor) {
-- condlog(3, "%s: holder already correct", check_dev);
-+ condlog(0, "%s: holder already correct", check_dev);
- continue;
- }
- table_name = dm_mapname(major, table_minor);
-
-- condlog(3, "%s: reassign table %s old %s new %s", check_dev,
-+ condlog(0, "%s: reassign table %s old %s new %s", check_dev,
- table_name, check_devt, new_devt);
-
- dm_reassign_table(table_name, check_devt, new_devt);
-Index: multipath-tools-120821/libmultipath/util.c
-===================================================================
---- multipath-tools-120821.orig/libmultipath/util.c
-+++ multipath-tools-120821/libmultipath/util.c
-@@ -161,6 +161,7 @@ devt2devname (char *devname, int devname
- struct stat statbuf;
-
- memset(block_path, 0, sizeof(block_path));
-+ memset(dev, 0, sizeof(dev));
- if (sscanf(devt, "%u:%u", &major, &minor) != 2) {
- condlog(0, "Invalid device number %s", devt);
- return 1;
-@@ -172,7 +173,7 @@ devt2devname (char *devname, int devname
- if (stat("/sys/dev/block", &statbuf) == 0) {
- /* Newer kernels have /sys/dev/block */
- sprintf(block_path,"/sys/dev/block/%u:%u", major, minor);
-- if (stat(block_path, &statbuf) == 0) {
-+ if (lstat(block_path, &statbuf) == 0) {
- if (S_ISLNK(statbuf.st_mode) &&
- readlink(block_path, dev, FILE_NAME_SIZE) > 0) {
- char *p = strrchr(dev, '/');