|
 |
e71b65 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
e71b65 |
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
e71b65 |
Date: Mon, 30 Jan 2023 19:54:19 -0600
|
|
|
e71b65 |
Subject: [PATCH] libmultipath: use select_reload_action in select_action
|
|
|
e71b65 |
|
|
|
e71b65 |
Since we have a function to set the action to reload, use it.
|
|
|
e71b65 |
|
|
|
e71b65 |
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
e71b65 |
---
|
|
|
e71b65 |
libmultipath/configure.c | 8 ++------
|
|
|
e71b65 |
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
e71b65 |
|
|
|
e71b65 |
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
|
|
|
e71b65 |
index 193bf27d..09d7de0f 100644
|
|
|
e71b65 |
--- a/libmultipath/configure.c
|
|
|
e71b65 |
+++ b/libmultipath/configure.c
|
|
|
e71b65 |
@@ -771,9 +771,7 @@ void select_action (struct multipath *mpp, const struct _vector *curmp,
|
|
|
e71b65 |
|
|
|
e71b65 |
if (force_reload) {
|
|
|
e71b65 |
mpp->force_udev_reload = 1;
|
|
|
e71b65 |
- mpp->action = ACT_RELOAD;
|
|
|
e71b65 |
- condlog(3, "%s: set ACT_RELOAD (forced by user)",
|
|
|
e71b65 |
- mpp->alias);
|
|
|
e71b65 |
+ select_reload_action(mpp, "forced by user");
|
|
|
e71b65 |
return;
|
|
|
e71b65 |
}
|
|
|
e71b65 |
if (cmpp->size != mpp->size) {
|
|
|
e71b65 |
@@ -786,9 +784,7 @@ void select_action (struct multipath *mpp, const struct _vector *curmp,
|
|
|
e71b65 |
|
|
|
e71b65 |
if (!is_udev_ready(cmpp) && count_active_paths(mpp) > 0) {
|
|
|
e71b65 |
mpp->force_udev_reload = 1;
|
|
|
e71b65 |
- mpp->action = ACT_RELOAD;
|
|
|
e71b65 |
- condlog(3, "%s: set ACT_RELOAD (udev incomplete)",
|
|
|
e71b65 |
- mpp->alias);
|
|
|
e71b65 |
+ select_reload_action(mpp, "udev incomplete");
|
|
|
e71b65 |
return;
|
|
|
e71b65 |
}
|
|
|
e71b65 |
|