42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From b31f8f5a21a90fb9087c02e00b6b69934a5bbdd5 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 9 Oct 2018 18:03:12 -0500
|
|
Subject: [PATCH] multipathd: minor fixes
|
|
|
|
In update_multipath(), conf is set again in a couple of lines, and
|
|
nothing uses it before then, so there's no point in setting it twice.
|
|
Also, in ev_remove_path(), strncpy() could end up unterminated, so
|
|
use strlcpy() instead.
|
|
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index ba796ab1..cd963043 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -429,7 +429,7 @@ int update_multipath (struct vectors *vecs, char *mapname, int reset)
|
|
continue;
|
|
|
|
if (pp->state != PATH_DOWN) {
|
|
- struct config *conf = get_multipath_config();
|
|
+ struct config *conf;
|
|
int oldstate = pp->state;
|
|
int checkint;
|
|
|
|
@@ -1097,7 +1097,7 @@ ev_remove_path (struct path *pp, struct vectors * vecs, int need_do_map)
|
|
/*
|
|
* flush_map will fail if the device is open
|
|
*/
|
|
- strncpy(alias, mpp->alias, WWID_SIZE);
|
|
+ strlcpy(alias, mpp->alias, WWID_SIZE);
|
|
if (mpp->flush_on_last_del == FLUSH_ENABLED) {
|
|
condlog(2, "%s Last path deleted, disabling queueing", mpp->alias);
|
|
mpp->retry_tick = 0;
|
|
--
|
|
2.11.0
|
|
|