[libmultipath] rename dm_reinstate() to dm_reinstate_path()

More explicit, and in line with dm_fail_path()

diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
index f8adb91..2544f95 100644 (file)
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -508,7 +508,7 @@ dm_fail_path(char * mapname, char * path)
 }
 
 int
-dm_reinstate(char * mapname, char * path)
+dm_reinstate_path(char * mapname, char * path)
 {
        char message[32];
 

diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h
index e8d5065..ad094eb 100644 (file)
--- a/libmultipath/devmapper.h
+++ b/libmultipath/devmapper.h
@@ -11,7 +11,7 @@ int dm_type(char *, char *);
 int dm_flush_map (char *, char *);
 int dm_flush_maps (char *);
 int dm_fail_path(char * mapname, char * path);
-int dm_reinstate(char * mapname, char * path);
+int dm_reinstate_path(char * mapname, char * path);
 int dm_queue_if_no_path(char *mapname, int enable);
 int dm_switchgroup(char * mapname, int index);
 int dm_enablegroup(char * mapname, int index);

diff --git a/multipath/main.c b/multipath/main.c
index 87dbfae..98bdda9 100644 (file)
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -579,7 +579,7 @@ reinstate_paths (struct multipath * mpp)
                                continue;
 
                        if (pp->dmstate == PSTATE_FAILED) {
-                               if (dm_reinstate(mpp->alias, pp->dev_t))
+                               if (dm_reinstate_path(mpp->alias, pp->dev_t))
                                        condlog(0, "error reinstating %s",
                                                pp->dev);
                        }

diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index aa6df90..452038a 100644 (file)
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -144,7 +144,7 @@ cli_reinstate(void * v, char ** reply, int * len, void * data)
        if (!pp || !pp->mpp || !pp->mpp->alias)
                return 1;
 
-       return dm_reinstate(pp->mpp->alias, pp->dev_t);
+       return dm_reinstate_path(pp->mpp->alias, pp->dev_t);
 }
 
 int

diff --git a/multipathd/main.c b/multipathd/main.c
index 58a0e63..9ec3089 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1109,7 +1109,7 @@ reinstate_path (struct path * pp)
        if (!pp->mpp)
                return;
 
-       if (dm_reinstate(pp->mpp->alias, pp->dev_t))
+       if (dm_reinstate_path(pp->mpp->alias, pp->dev_t))
                condlog(0, "%s: reinstate failed", pp->dev_t);
        else {
                condlog(2, "%s: reinstated", pp->dev_t);