diff options
| author | Christophe Varoqui <root@xa-s05.(none)> | 2006-01-15 16:10:36 +0100 |
|---|---|---|
| committer | Christophe Varoqui <root@xa-s05.(none)> | 2006-01-15 16:10:36 +0100 |
| commit | 58f201ef7a4a6e8ae388f4320614133cdc7a8c2d (patch) | |
| tree | ec298d0527d2257b0e076f7ee2e4d04a4b9ded6b /libmultipath | |
| parent | eac085464cff877c6e6f5b2e53b2f074b0ba9fab (diff) | |
| download | multipath-tools-58f201ef7a4a6e8ae388f4320614133cdc7a8c2d.tar.gz multipath-tools-58f201ef7a4a6e8ae388f4320614133cdc7a8c2d.tar.bz2 multipath-tools-58f201ef7a4a6e8ae388f4320614133cdc7a8c2d.zip | |
[libmultipath] define more defaults to defaults.h
And use them in propsel.c when appropriate.
Diffstat (limited to 'libmultipath')
| -rw-r--r-- | libmultipath/defaults.h | 8 | ||||
| -rw-r--r-- | libmultipath/propsel.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index 4bac55d..784263f 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -4,11 +4,17 @@ #define DEFAULT_FEATURES "0" #define DEFAULT_HWHANDLER "0" #define DEFAULT_MINIO 1000 +#define DEFAULT_GETPRIO NULL +#define DEFAULT_PGPOLICY FAILOVER +#define DEFAULT_FAILBACK -FAILBACK_MANUAL +#define DEFAULT_RR_WEIGHT RR_WEIGHT_NONE +#define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF +#define DEFAULT_USER_FRIENDLY_NAMES 0 #define DEFAULT_TARGET "multipath" #define DEFAULT_PIDFILE "/var/run/multipathd.pid" #define DEFAULT_SOCKET "/var/run/multipathd.sock" #define DEFAULT_CONFIGFILE "/etc/multipath.conf" -#define DEFAULT_BINDINGS_FILE "/var/lib/multipath/bindings" +#define DEFAULT_BINDINGS_FILE "/var/lib/multipath/bindings" char * set_default (char * str); diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 980649a..a26d62b 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -76,7 +76,7 @@ select_pgfailback (struct multipath * mp) mp->pgfailback); return 0; } - mp->pgfailback = -FAILBACK_MANUAL; + mp->pgfailback = DEFAULT_FAILBACK; condlog(3, "pgfailover = %i (internal default)", mp->pgfailback); return 0; } @@ -118,7 +118,7 @@ select_pgpolicy (struct multipath * mp) condlog(3, "pgpolicy = %s (config file default)", pgpolicy_name); return 0; } - mp->pgpolicy = FAILOVER; + mp->pgpolicy = DEFAULT_PGPOLICY; mp->pgpolicyfn = pgpolicies[mp->pgpolicy]; if (get_pgpolicy_name(pgpolicy_name, mp->pgpolicy)) return 1; |