9abdc502cf
Rebased on top of additional commits staged for upstream
* Previous patches 0048-0060 are now patches 0053-0054 & 0059-0069
Add 0048-libmultipath-add-device-to-hwtable.c.patch
Add 0049-master-libmultipath-fix-use-after-free-when-iscsi-lo.patch
Add 0050-libmultipath-warn-if-freeing-path-that-holds-mpp-hwe.patch
Add 0051-libmultipath-warn-about-NULL-value-of-mpp-hwe.patch
Add 0052-libmultipath-fix-mpp-hwe-handling-in-sync_paths.patch
Add 0055-libmultipath-remove-code-duplication-in-path-countin.patch
Add 0056-libmultipath-count-pending-paths-as-active-on-loads.patch
Add 0057-libmultipath-deal-with-flushing-no-maps.patch
Add 0058-multipath-deal-with-delegation-failures-correctly.patch
Add 0070-multipath-add-libmpathvalid-library.patch
* adds the libmpathvalid.so library to determine if devices are
valid multipath paths.
Add 0071-libmultipath-add-uid-failback-for-dasd-devices.patch
Add 0072-libmultipath-add-ignore_udev_uid-option.patch
130 lines
3.9 KiB
Diff
130 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 21 Jul 2020 01:12:05 -0500
|
|
Subject: [PATCH] libmultipath: remove code duplication in path counting
|
|
|
|
pathcountgr() is never used except by pathcount(), and neither is the
|
|
special case for PATH_WILD. Simplify this and make one function that is
|
|
used by both pathcount() and count_active_paths(). This will be used
|
|
again in a future patch.
|
|
|
|
Also use count_active_paths() in mpath_persist.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist.c | 4 +--
|
|
libmultipath/structs.c | 47 +++++++++++++--------------------
|
|
libmultipath/structs.h | 1 -
|
|
3 files changed, 21 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
|
|
index 3da7a6cf..a132f4e9 100644
|
|
--- a/libmpathpersist/mpath_persist.c
|
|
+++ b/libmpathpersist/mpath_persist.c
|
|
@@ -436,7 +436,7 @@ int mpath_prout_reg(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
|
|
all_tg_pt = (mpp->all_tg_pt == ALL_TG_PT_ON ||
|
|
paramp->sa_flags & MPATH_F_ALL_TG_PT_MASK);
|
|
- active_pathcount = pathcount(mpp, PATH_UP) + pathcount(mpp, PATH_GHOST);
|
|
+ active_pathcount = count_active_paths(mpp);
|
|
|
|
if (active_pathcount == 0) {
|
|
condlog (0, "%s: no path available", mpp->wwid);
|
|
@@ -648,7 +648,7 @@ int mpath_prout_rel(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
if (!mpp)
|
|
return MPATH_PR_DMMP_ERROR;
|
|
|
|
- active_pathcount = pathcount (mpp, PATH_UP) + pathcount (mpp, PATH_GHOST);
|
|
+ active_pathcount = count_active_paths(mpp);
|
|
|
|
struct threadinfo thread[active_pathcount];
|
|
memset(thread, 0, sizeof(thread));
|
|
diff --git a/libmultipath/structs.c b/libmultipath/structs.c
|
|
index 2dd378c4..3eac3d61 100644
|
|
--- a/libmultipath/structs.c
|
|
+++ b/libmultipath/structs.c
|
|
@@ -455,49 +455,40 @@ find_path_by_devt (const struct _vector *pathvec, const char * dev_t)
|
|
return NULL;
|
|
}
|
|
|
|
-int pathcountgr(const struct pathgroup *pgp, int state)
|
|
+static int do_pathcount(const struct multipath *mpp, const int *states,
|
|
+ unsigned int nr_states)
|
|
{
|
|
+ struct pathgroup *pgp;
|
|
struct path *pp;
|
|
int count = 0;
|
|
- int i;
|
|
+ unsigned int i, j, k;
|
|
|
|
- vector_foreach_slot (pgp->paths, pp, i)
|
|
- if ((pp->state == state) || (state == PATH_WILD))
|
|
- count++;
|
|
+ if (!mpp->pg || !nr_states)
|
|
+ return count;
|
|
|
|
+ vector_foreach_slot (mpp->pg, pgp, i) {
|
|
+ vector_foreach_slot (pgp->paths, pp, j) {
|
|
+ for (k = 0; k < nr_states; k++) {
|
|
+ if (pp->state == states[k]) {
|
|
+ count++;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
return count;
|
|
}
|
|
|
|
int pathcount(const struct multipath *mpp, int state)
|
|
{
|
|
- struct pathgroup *pgp;
|
|
- int count = 0;
|
|
- int i;
|
|
-
|
|
- if (mpp->pg) {
|
|
- vector_foreach_slot (mpp->pg, pgp, i)
|
|
- count += pathcountgr(pgp, state);
|
|
- }
|
|
- return count;
|
|
+ return do_pathcount(mpp, &state, 1);
|
|
}
|
|
|
|
int count_active_paths(const struct multipath *mpp)
|
|
{
|
|
- struct pathgroup *pgp;
|
|
- struct path *pp;
|
|
- int count = 0;
|
|
- int i, j;
|
|
-
|
|
- if (!mpp->pg)
|
|
- return 0;
|
|
+ int states[] = {PATH_UP, PATH_GHOST};
|
|
|
|
- vector_foreach_slot (mpp->pg, pgp, i) {
|
|
- vector_foreach_slot (pgp->paths, pp, j) {
|
|
- if (pp->state == PATH_UP || pp->state == PATH_GHOST)
|
|
- count++;
|
|
- }
|
|
- }
|
|
- return count;
|
|
+ return do_pathcount(mpp, states, 2);
|
|
}
|
|
|
|
int pathcmp(const struct pathgroup *pgp, const struct pathgroup *cpgp)
|
|
diff --git a/libmultipath/structs.h b/libmultipath/structs.h
|
|
index d69bc2e9..0c03e711 100644
|
|
--- a/libmultipath/structs.h
|
|
+++ b/libmultipath/structs.h
|
|
@@ -446,7 +446,6 @@ struct path * find_path_by_devt (const struct _vector *pathvec, const char *devt
|
|
struct path * find_path_by_dev (const struct _vector *pathvec, const char *dev);
|
|
struct path * first_path (const struct multipath *mpp);
|
|
|
|
-int pathcountgr (const struct pathgroup *, int);
|
|
int pathcount (const struct multipath *, int);
|
|
int count_active_paths(const struct multipath *);
|
|
int pathcmp (const struct pathgroup *, const struct pathgroup *);
|
|
--
|
|
2.17.2
|
|
|