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
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 30 Jul 2018 14:28:02 -0500
|
|
Subject: [PATCH] libmultipath: remove unused code
|
|
|
|
since vector_foreach_slot() already checks if the entry is NULL, there's
|
|
no point in checking it in the loop, since it can't be NULL there. Found
|
|
by coverity.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/print.c | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/libmultipath/print.c b/libmultipath/print.c
|
|
index 9da6a77..7b610b9 100644
|
|
--- a/libmultipath/print.c
|
|
+++ b/libmultipath/print.c
|
|
@@ -275,8 +275,6 @@ snprint_multipath_vpr (char * buff, size_t len, const struct multipath * mpp)
|
|
int i, j;
|
|
|
|
vector_foreach_slot(mpp->pg, pgp, i) {
|
|
- if (!pgp)
|
|
- continue;
|
|
vector_foreach_slot(pgp->paths, pp, j) {
|
|
if (strlen(pp->vendor_id) && strlen(pp->product_id))
|
|
return snprintf(buff, len, "%s,%s",
|
|
@@ -295,8 +293,6 @@ snprint_multipath_vend (char * buff, size_t len, const struct multipath * mpp)
|
|
int i, j;
|
|
|
|
vector_foreach_slot(mpp->pg, pgp, i) {
|
|
- if (!pgp)
|
|
- continue;
|
|
vector_foreach_slot(pgp->paths, pp, j) {
|
|
if (strlen(pp->vendor_id))
|
|
return snprintf(buff, len, "%s", pp->vendor_id);
|
|
@@ -313,8 +309,6 @@ snprint_multipath_prod (char * buff, size_t len, const struct multipath * mpp)
|
|
int i, j;
|
|
|
|
vector_foreach_slot(mpp->pg, pgp, i) {
|
|
- if (!pgp)
|
|
- continue;
|
|
vector_foreach_slot(pgp->paths, pp, j) {
|
|
if (strlen(pp->product_id))
|
|
return snprintf(buff, len, "%s", pp->product_id);
|
|
@@ -331,8 +325,6 @@ snprint_multipath_rev (char * buff, size_t len, const struct multipath * mpp)
|
|
int i, j;
|
|
|
|
vector_foreach_slot(mpp->pg, pgp, i) {
|
|
- if (!pgp)
|
|
- continue;
|
|
vector_foreach_slot(pgp->paths, pp, j) {
|
|
if (strlen(pp->rev))
|
|
return snprintf(buff, len, "%s", pp->rev);
|
|
--
|
|
2.7.4
|
|
|