The previous patch "libmultipath: merge hwentries inside a conf file" meant to enable checking for duplicate entries not only between different "sections" of the configuration (i.e. built-in hwtable, multipath.conf, config dir files), but also inside every section except the built-in table. This patch fixes a bug to actually implement this new behavior.
Signed-off-by: Martin Wilck <[email protected]> --- libmultipath/config.c | 3 --- tests/hwtable.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index 28b76dd2..50826a1d 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -527,9 +527,6 @@ factorize_hwtable (vector hw, int n, const char *table_desc) restart: vector_foreach_slot(hw, hwe1, i) { - if (i == n) - break; - j = n; /* drop invalid device configs */ if (i >= n && (!hwe1->vendor || !hwe1->product)) { condlog(0, "device config in %s missing vendor or product parameter", diff --git a/tests/hwtable.c b/tests/hwtable.c index 3488640d..42127adf 100644 --- a/tests/hwtable.c +++ b/tests/hwtable.c @@ -661,8 +661,7 @@ static void test_broken_hwe(const struct hwt_state *hwt) /* foo:bar doesn't match, as hwentry is ignored */ pp = mock_path(vnd_foo.value, prd_bar.value); - TEST_PROP_BROKEN("prio", prio_name(&pp->prio), prio_emc.value, - DEFAULT_PRIO); + TEST_PROP(prio_name(&pp->prio), DEFAULT_PRIO); /* boo:bar doesn't match */ pp = mock_path(vnd_boo.value, prd_bar.value); -- 2.17.1 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
