b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Fri, 8 Jan 2021 17:22:09 +0100
|
|
Subject: [PATCH] libmultipath: select_action(): skip is_mpp_known_to_udev()
|
|
test
|
|
|
|
This test is now superseded by the check introduced in
|
|
0d66e03 ("libmultipath: force map reload if udev incomplete").
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/configure.c | 15 ---------------
|
|
1 file changed, 15 deletions(-)
|
|
|
|
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
|
|
index d9fd9cb8..999f3106 100644
|
|
--- a/libmultipath/configure.c
|
|
+++ b/libmultipath/configure.c
|
|
@@ -635,15 +635,6 @@ trigger_paths_udev_change(struct multipath *mpp, bool is_mpath)
|
|
mpp->needs_paths_uevent = 0;
|
|
}
|
|
|
|
-static int
|
|
-is_mpp_known_to_udev(const struct multipath *mpp)
|
|
-{
|
|
- struct udev_device *udd = get_udev_for_mpp(mpp);
|
|
- int ret = (udd != NULL);
|
|
- udev_device_unref(udd);
|
|
- return ret;
|
|
-}
|
|
-
|
|
static int
|
|
sysfs_set_max_sectors_kb(struct multipath *mpp, int is_reload)
|
|
{
|
|
@@ -865,12 +856,6 @@ void select_action (struct multipath *mpp, const struct _vector *curmp,
|
|
mpp->alias);
|
|
return;
|
|
}
|
|
- if (!is_mpp_known_to_udev(cmpp)) {
|
|
- mpp->action = ACT_RELOAD;
|
|
- condlog(3, "%s: set ACT_RELOAD (udev device not initialized)",
|
|
- mpp->alias);
|
|
- return;
|
|
- }
|
|
mpp->action = ACT_NOTHING;
|
|
condlog(3, "%s: set ACT_NOTHING (map unchanged)",
|
|
mpp->alias);
|