[priority] pp_sgi is actually a RDAC controller familly prioritizer

So rename, as suggested by Hannes.

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 356e184..57874f6 100644 (file)
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -294,7 +294,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "1742",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_rdac /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -310,7 +310,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "3526",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_rdac /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -506,7 +506,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "SGI",
                .product       = "TP9[45]00",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_rdac /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -521,7 +521,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "SGI",
                .product       = "IS.*",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_rdac /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -542,7 +542,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "STK",
                .product       = "OPENstorage D280",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_rdac /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,

diff --git a/multipath-tools.spec.in b/multipath-tools.spec.in
index 9d6a7ea..3caede6 100644 (file)
--- a/multipath-tools.spec.in
+++ b/multipath-tools.spec.in
@@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/sbin/mpath_prio_random
 %{prefix}/sbin/mpath_prio_balance_units
 %{prefix}/sbin/mpath_prio_netapp
-%{prefix}/sbin/mpath_prio_tpc
+%{prefix}/sbin/mpath_prio_rdac
 %{prefix}/sbin/mpath_prio_hds_modular
 %{prefix}/usr/share/man/man8/devmap_name.8.gz
 %{prefix}/usr/share/man/man8/multipath.8.gz

diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 905cb65..c8ab6b0 100644 (file)
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -133,7 +133,7 @@ Generate the path priority based on the SCSI-3 ALUA settings.
 .B mpath_prio_netapp /dev/%n
 Generate the path priority for NetApp arrays.
 .TP
-.B mpath_prio_tpc /dev/%n
+.B mpath_prio_rdac /dev/%n
 Generate the path priority for LSI/Engenio RDAC controller.
 .TP
 .B mpath_prio_hp_sw /dev/%n

diff --git a/path_priority/pp_tpc/Makefile b/path_priority/pp_rdac/Makefile
similarity index 88%
rename from path_priority/pp_tpc/Makefile
rename to path_priority/pp_rdac/Makefile
index c03e4c4..64ed4c3 100644 (file)
--- a/path_priority/pp_tpc/Makefile
+++ b/path_priority/pp_rdac/Makefile
@@ -1,6 +1,6 @@
-EXEC           = mpath_prio_tpc
+EXEC           = mpath_prio_rdac
 BUILD          = glibc
-OBJS           = pp_tpc.o
+OBJS           = pp_rdac.o
 
 TOPDIR         = ../..
 include $(TOPDIR)/Makefile.inc

diff --git a/path_priority/pp_tpc/pp_tpc.c b/path_priority/pp_rdac/pp_rdac.c
similarity index 97%
rename from path_priority/pp_tpc/pp_tpc.c
rename to path_priority/pp_rdac/pp_rdac.c
index a7ed7ad..49a13cf 100644 (file)
--- a/path_priority/pp_tpc/pp_tpc.c
+++ b/path_priority/pp_rdac/pp_rdac.c
@@ -13,7 +13,7 @@
 #define INQUIRY_CMD     0x12
 #define INQUIRY_CMDLEN  6
 
-int sgi_tpc_prio(const char *dev)
+int rdac_prio(const char *dev)
 {
        unsigned char sense_buffer[256];
        unsigned char sb[128];
@@ -105,7 +105,7 @@ main (int argc, char **argv)
                fprintf(stderr, "Usage: %s device\n", argv[0]);
                prio = 0;
        } else
-               prio = sgi_tpc_prio(argv[1]);
+               prio = rdac_prio(argv[1]);
 
        printf("%d\n", prio);
        exit(0);