996407fc5f
Update Source to latest upstream commit Rename files * Previous patches 0001-0020 are now patches 0002-0021 * Previous patches 0021-0028 are now patches 0026-0033 Add 0001-kpartx-Use-absolute-paths-to-create-mappings.patch Add 0022-multipathd-check-for-NULL-udevice-in-cli_add_path.patch Add 0023-libmultipath-remove-max_fds-code-duplication.patch Add 0024-multipathd-set-return-code-for-multipathd-commands.patch Add 0025-mpathpersist-fix-registration-rollback-issue.patch * The above 5 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 cd96304..463b1b8 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -1979,14 +1979,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
|
|
|