c79ce3480d
Update Source to latest upstream commit * Previous patches 0001-0018 are included in this commit Rename files * Previous patches 0019-0028 are now patches 0002-0003 & 0012-0019 Add 0001-libmultipath-remove-last-of-rbd-code.patch Add 0004-mpathpersist-add-param-alltgpt-option.patch * mpathpersist now accepts --param-alltgpt Add 0005-libmutipath-remove-unused-IDE-bus-type.patch Add 0006-multipathd-add-new-protocol-path-wildcard.patch * multipathd show paths format now accepts %P for the path * protocol/transport Add 0007-libmultipath-add-protocol-blacklist-option.patch * You can now use the "protocol" blacklist section parameter to * blacklist by protocol/transport Add 0008-libmultipath-remove-_filter_-blacklist-functions.patch Add 0009-multipath-tests-change-to-work-with-old-make-version.patch Add 0010-multipath-tests-add-blacklist-tests.patch Add 0011-mpathpersist-add-missing-param-rk-usage-info.patch Refresh 0013-RH-Remove-the-property-blacklist-exception-builtin.patch Modify 0016-RH-add-mpathconf.patch * improve usage message and man page
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 1 Jun 2018 16:30:44 -0500
|
|
Subject: [PATCH] libmultipath: remove last of rbd code
|
|
|
|
My previous patch to remove the rbd code missed a little bit.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
kpartx/del-part-nodes.rules | 2 +-
|
|
libmultipath/structs.h | 1 -
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/kpartx/del-part-nodes.rules b/kpartx/del-part-nodes.rules
|
|
index 17bc505..0ceecf5 100644
|
|
--- a/kpartx/del-part-nodes.rules
|
|
+++ b/kpartx/del-part-nodes.rules
|
|
@@ -10,7 +10,7 @@
|
|
# or create an udev rule file that sets ENV{DONT_DEL_PART_NODES}="1".
|
|
|
|
SUBSYSTEM!="block", GOTO="end_del_part_nodes"
|
|
-KERNEL!="sd*|dasd*|rbd*", GOTO="end_del_part_nodes"
|
|
+KERNEL!="sd*|dasd*", GOTO="end_del_part_nodes"
|
|
ACTION!="add|change", GOTO="end_del_part_nodes"
|
|
ENV{DEVTYPE}=="partition", GOTO="end_del_part_nodes"
|
|
|
|
diff --git a/libmultipath/structs.h b/libmultipath/structs.h
|
|
index e5b698b..ca14315 100644
|
|
--- a/libmultipath/structs.h
|
|
+++ b/libmultipath/structs.h
|
|
@@ -61,7 +61,6 @@ enum sysfs_buses {
|
|
SYSFS_BUS_IDE,
|
|
SYSFS_BUS_CCW,
|
|
SYSFS_BUS_CCISS,
|
|
- SYSFS_BUS_RBD,
|
|
SYSFS_BUS_NVME,
|
|
};
|
|
|
|
--
|
|
2.7.4
|
|
|