[libmultipath] rename find_mp() to find_mp_by_alias()

More coherent with find_mp_by_wwid() and find_mp_by_minor()

diff --git a/libmultipath/structs.c b/libmultipath/structs.c
index e6128f3..122a27a 100644 (file)
--- a/libmultipath/structs.c
+++ b/libmultipath/structs.c
@@ -226,7 +226,7 @@ find_mp_by_wwid (vector mp, char * wwid)
 }
 
 struct multipath *
-find_mp (vector mp, char * alias)
+find_mp_by_alias (vector mp, char * alias)
 {
        int i;
        int len;

diff --git a/libmultipath/structs.h b/libmultipath/structs.h
index bb35bd1..223f479 100644 (file)
--- a/libmultipath/structs.h
+++ b/libmultipath/structs.h
@@ -167,7 +167,7 @@ void free_multipathvec (vector mpvec, int free_paths);
 int store_path (vector pathvec, struct path * pp);
 int store_pathgroup (vector pgvec, struct pathgroup * pgp);
 
-struct multipath * find_mp (vector mp, char * alias);
+struct multipath * find_mp_by_alias (vector mp, char * alias);
 struct multipath * find_mp_by_wwid (vector mp, char * wwid);
 struct multipath * find_mp_by_minor (vector mp, int minor);
        

diff --git a/multipath/main.c b/multipath/main.c
index f253f5f..87dbfae 100644 (file)
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -485,7 +485,7 @@ select_action (struct multipath * mpp, vector curmp)
 {
        struct multipath * cmpp;
 
-       cmpp = find_mp(curmp, mpp->alias);
+       cmpp = find_mp_by_alias(curmp, mpp->alias);
 
        if (!cmpp) {
                cmpp = find_mp_by_wwid(curmp, mpp->wwid);

diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index 810d458..aa6df90 100644 (file)
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -101,7 +101,7 @@ cli_suspend(void * v, char ** reply, int * len, void * data)
        if (!r) /* error */
                return 1;
        
-       struct multipath * mpp = find_mp(vecs->mpvec, param);
+       struct multipath * mpp = find_mp_by_alias(vecs->mpvec, param);
 
        if (!mpp)
                return 1;
@@ -120,7 +120,7 @@ cli_resume(void * v, char ** reply, int * len, void * data)
        if (!r) /* error */
                return 1;
        
-       struct multipath * mpp = find_mp(vecs->mpvec, param);
+       struct multipath * mpp = find_mp_by_alias(vecs->mpvec, param);
 
        if (!mpp)
                return 1;

diff --git a/multipathd/main.c b/multipathd/main.c
index f167817..58a0e63 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -452,7 +452,7 @@ update_multipath (struct vectors *vecs, char *mapname)
        int i, j;
        int r = 1;
 
-       mpp = find_mp(vecs->mpvec, mapname);
+       mpp = find_mp_by_alias(vecs->mpvec, mapname);
 
        if (!mpp)
                goto out;
@@ -677,7 +677,7 @@ uev_add_map (char * devname, struct vectors * vecs)
                return 0;
        }
 
-       mpp = find_mp(vecs->mpvec, alias);
+       mpp = find_mp_by_alias(vecs->mpvec, alias);
 
        if (mpp) {
                /*