[libmultipath] comestic changes

In struct.h, moved a bunch of defines to enums :
- SYSFS_BUS_*
- [KEEP|FREE]_PATHS
- FAILBACK_*

Renamed *_RESERVED to *_UNDEF all over includes.

Update all users.

diff --git a/libcheckers/checkers.h b/libcheckers/checkers.h
index 3dde54a..363147f 100644 (file)
--- a/libcheckers/checkers.h
+++ b/libcheckers/checkers.h
@@ -6,7 +6,7 @@
 #define MAX_CHECKER_MSG_SIZE 256
 
 enum checkers {
-       CHECKER_RESERVED,
+       CHECKER_UNDEF,
        TUR,
        READSECTOR0,
        EMC_CLARIION,

diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index a3dfa96..2280a00 100644 (file)
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -136,9 +136,9 @@ default_failback_handler(vector strvec)
        buff = set_value(strvec);
 
        if (!strncmp(buff, "manual", 6))
-               conf->pgfailback = FAILBACK_MANUAL;
+               conf->pgfailback = -FAILBACK_MANUAL;
        else if (!strncmp(buff, "immediate", 9))
-               conf->pgfailback = FAILBACK_IMMEDIATE;
+               conf->pgfailback = -FAILBACK_IMMEDIATE;
        else
                conf->pgfailback = atoi(buff);
 
@@ -374,9 +374,9 @@ hw_failback_handler(vector strvec)
        buff = set_value(strvec);
 
        if (!strncmp(buff, "manual", 6))
-               hwe->pgfailback = FAILBACK_MANUAL;
+               hwe->pgfailback = -FAILBACK_MANUAL;
        else if (!strncmp(buff, "immediate", 9))
-               hwe->pgfailback = FAILBACK_IMMEDIATE;
+               hwe->pgfailback = -FAILBACK_IMMEDIATE;
        else
                hwe->pgfailback = atoi(buff);
 
@@ -498,9 +498,9 @@ mp_failback_handler(vector strvec)
        buff = set_value(strvec);
 
        if (!strncmp(buff, "manual", 6))
-               mpe->pgfailback = FAILBACK_MANUAL;
+               mpe->pgfailback = -FAILBACK_MANUAL;
        else if (!strncmp(buff, "immediate", 9))
-               mpe->pgfailback = FAILBACK_IMMEDIATE;
+               mpe->pgfailback = -FAILBACK_IMMEDIATE;
        else
                mpe->pgfailback = atoi(buff);
 

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 2b2784c..316549d 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -350,7 +350,7 @@ sysfs_get_bus (char * sysfs_path, struct path * curpath)
        char attr_path[FILE_NAME_SIZE];
        char attr_buff[FILE_NAME_SIZE];
 
-       curpath->bus = SYSFS_BUS_NONE;
+       curpath->bus = SYSFS_BUS_UNDEF;
 
        /*
         * This is ugly : we should be able to do a simple
@@ -473,7 +473,7 @@ sysfs_pathinfo(struct path * curpath)
        if (common_sysfs_pathinfo(curpath))
                return 1;
 
-       if (curpath->bus == SYSFS_BUS_NONE)
+       if (curpath->bus == SYSFS_BUS_UNDEF)
                return 0;
        else if (curpath->bus == SYSFS_BUS_SCSI)
                if (scsi_sysfs_pathinfo(curpath))

diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c
index a794885..59e32fd 100644 (file)
--- a/libmultipath/dmparser.c
+++ b/libmultipath/dmparser.c
@@ -340,7 +340,7 @@ disassemble_status (char * params, struct multipath * mpp)
                        pgp->status = PGSTATE_ENABLED;
                        break;
                default:
-                       pgp->status = PGSTATE_RESERVED;
+                       pgp->status = PGSTATE_UNDEF;
                        break;
                }
                FREE(word);

diff --git a/libmultipath/pgpolicies.h b/libmultipath/pgpolicies.h
index e0a1c65..3a71fac 100644 (file)
--- a/libmultipath/pgpolicies.h
+++ b/libmultipath/pgpolicies.h
@@ -11,7 +11,7 @@
 
 /* Storage controlers capabilities */
 enum iopolicies { 
-       IOPOLICY_RESERVED,
+       IOPOLICY_UNDEF,
        FAILOVER,
        MULTIBUS,
        GROUP_BY_SERIAL,

diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
index 7242af9..baac293 100644 (file)
--- a/libmultipath/propsel.c
+++ b/libmultipath/propsel.c
@@ -33,7 +33,7 @@ select_pgfailback (struct multipath * mp)
                        mp->pgfailback);
                return 0;
        }
-       mp->pgfailback = FAILBACK_MANUAL;
+       mp->pgfailback = -FAILBACK_MANUAL;
        condlog(3, "pgfailover = %i (internal default)", mp->pgfailback);
        return 0;
 }

diff --git a/libmultipath/structs.h b/libmultipath/structs.h
index f37293a..08a2a5e 100644 (file)
--- a/libmultipath/structs.h
+++ b/libmultipath/structs.h
@@ -14,25 +14,31 @@
 #define SCSI_PRODUCT_SIZE      17
 #define SCSI_REV_SIZE          5
 
-#define KEEP_PATHS             0
-#define FREE_PATHS             1
+enum free_path_switch {
+       KEEP_PATHS,
+       FREE_PATHS
+};
 
-#define FAILBACK_UNDEF         0
-#define FAILBACK_MANUAL                -1
-#define FAILBACK_IMMEDIATE     -2
+enum failback_mode {
+       FAILBACK_UNDEF,
+       FAILBACK_MANUAL,
+       FAILBACK_IMMEDIATE
+};
 
-#define SYSFS_BUS_NONE         0
-#define SYSFS_BUS_SCSI         1
-#define SYSFS_BUS_IDE          2
+enum sysfs_buses {
+       SYSFS_BUS_UNDEF,
+       SYSFS_BUS_SCSI,
+       SYSFS_BUS_IDE
+};
 
 enum pathstates {
-       PSTATE_RESERVED,
+       PSTATE_UNDEF,
        PSTATE_FAILED,
        PSTATE_ACTIVE
 };
 
 enum pgstates {
-       PGSTATE_RESERVED,
+       PGSTATE_UNDEF,
        PGSTATE_ENABLED,
        PGSTATE_DISABLED,
        PGSTATE_ACTIVE

diff --git a/multipath/main.c b/multipath/main.c
index 557c8cd..b8deffc 100644 (file)
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -378,7 +378,6 @@ setup_map (struct multipath * mpp)
 
        /*
         * don't bother if a constituant path is claimed
-        * FIXME : claimed detection broken, always unclaimed for now
         */
        vector_foreach_slot (mpp->paths, pp, i) {
                if (pp->claimed) {

diff --git a/multipathd/main.c b/multipathd/main.c
index 114ab46..c6fea67 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -239,7 +239,7 @@ switch_pathgroup (struct multipath * mpp)
        struct path * pp;
        int i, j;
        
-       if (!mpp || mpp->pgfailback == FAILBACK_MANUAL)
+       if (!mpp || mpp->pgfailback == -FAILBACK_MANUAL)
                return;
        /*
         * Refresh path priority values
@@ -1142,7 +1142,7 @@ checkerloop (void *ap)
                                        pp->mpp->failback_tick =
                                                pp->mpp->pgfailback;
 
-                               if (pp->mpp->pgfailback == FAILBACK_IMMEDIATE)
+                               if (pp->mpp->pgfailback == -FAILBACK_IMMEDIATE)
                                        switch_pathgroup(pp->mpp);
 
                                /*