3ec0ebefcd
- Update Source to latest upstream commit
* Previous patches 0001-0011 are included in this commit
- Rename files
* Previous patches 0012-0019 are now patches 0021-0028
- Add 0001-libmultipath-fix-tur-checker-timeout.patch
- Add 0002-libmultipath-fix-tur-checker-double-locking.patch
- Add 0003-libmultipath-fix-tur-memory-misuse.patch
- Add 0004-libmultipath-cleanup-tur-locking.patch
- Add 0005-libmultipath-fix-tur-checker-timeout-issue.patch
* The above 5 patches cleanup locking issues with the
tur checker threads
- Add 0006-libmultipath-fix-set_int-error-path.patch
- Add 0007-libmultipath-fix-length-issues-in-get_vpd_sgio.patch
- Add 0008-libmultipath-_install_keyword-cleanup.patch
- Add 0009-libmultipath-remove-unused-code.patch
- Add 0010-libmultipath-fix-memory-issue-in-path_latency-prio.patch
- Add 0011-libmultipath-fix-null-dereference-int-alloc_path_gro.patch
- Add 0012-libmutipath-don-t-use-malformed-uevents.patch
- Add 0013-multipath-fix-max-array-size-in-print_cmd_valid.patch
- Add 0014-multipathd-function-return-value-tweaks.patch
- Add 0015-multipathd-minor-fixes.patch
- Add 0016-multipathd-remove-useless-check-and-fix-format.patch
- Add 0017-multipathd-fix-memory-leak-on-error-in-configure.patch
* The above 12 patches fix minor issues found by coverity
- Add 0018-libmultipath-Don-t-blank-intialized-paths.patch
- Add 0019-libmultipath-Fixup-updating-paths.patch
* Fix issues with paths whose wwid was not set or later changes
- Add 0020-multipath-tweak-logging-style.patch
* multipathd interactive commands now send errors to stderr, instead
of syslog
* The above 20 patches have been submitted upstream
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 31 Jul 2018 16:00:20 -0500
|
|
Subject: [PATCH] multipathd: remove useless check and fix format
|
|
|
|
The only thing this patch changes is to remove the check for pp->mpp
|
|
before the check for pp->mpp->prflags, since check_path() already
|
|
verified that pp->mpp != NULL. This fixes a number of coverity warnings.
|
|
Also, I normalized the spacing and indenting of the nearby code.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 125a805..3c2fe7b 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -1978,14 +1978,14 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
|
|
return 1;
|
|
}
|
|
|
|
- if(newstate == PATH_UP || newstate == PATH_GHOST){
|
|
- if ( pp->mpp && pp->mpp->prflag ){
|
|
+ if (newstate == PATH_UP || newstate == PATH_GHOST) {
|
|
+ if (pp->mpp->prflag) {
|
|
/*
|
|
* Check Persistent Reservation.
|
|
*/
|
|
- condlog(2, "%s: checking persistent reservation "
|
|
- "registration", pp->dev);
|
|
- mpath_pr_event_handle(pp);
|
|
+ condlog(2, "%s: checking persistent "
|
|
+ "reservation registration", pp->dev);
|
|
+ mpath_pr_event_handle(pp);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.7.4
|
|
|