store_pathgroup() is only called by add_pathgroup(), and doesn't need to exist as a seperate function. Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx> --- libmultipath/structs.c | 16 +++------------- libmultipath/structs.h | 1 - 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/libmultipath/structs.c b/libmultipath/structs.c index fee899bd..bf7fdd73 100644 --- a/libmultipath/structs.c +++ b/libmultipath/structs.c @@ -318,23 +318,13 @@ store_path (vector pathvec, struct path * pp) return 0; } -int -store_pathgroup (vector pgvec, struct pathgroup * pgp) +int add_pathgroup(struct multipath *mpp, struct pathgroup *pgp) { - if (!vector_alloc_slot(pgvec)) + if (!vector_alloc_slot(mpp->pg)) return 1; - vector_set_slot(pgvec, pgp); - - return 0; -} - -int add_pathgroup(struct multipath *mpp, struct pathgroup *pgp) -{ - int ret = store_pathgroup(mpp->pg, pgp); + vector_set_slot(mpp->pg, pgp); - if (ret) - return ret; pgp->mpp = mpp; return 0; } diff --git a/libmultipath/structs.h b/libmultipath/structs.h index 1a3d827b..893074eb 100644 --- a/libmultipath/structs.h +++ b/libmultipath/structs.h @@ -445,7 +445,6 @@ int store_adaptergroup(vector adapters, struct adapter_group *agp); int store_hostgroup(vector hostgroupvec, struct host_group *hgp); int store_path (vector pathvec, struct path * pp); -int store_pathgroup (vector pgvec, struct pathgroup * pgp); int add_pathgroup(struct multipath*, struct pathgroup *); struct multipath * find_mp_by_alias (const struct _vector *mp, const char *alias); -- 2.17.2 -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel