Merged. On Mon, Oct 17, 2016 at 6:32 PM, Xose Vazquez Perez <xose.vazq...@gmail.com> wrote:
> replace RR_WEIGHT_NONE with DEFAULT_RR_WEIGHT, and define DEFAULT_FLUSH > > Cc: Benjamin Marzinski <bmarz...@redhat.com> > Cc: Hannes Reinecke <h...@suse.de> > Cc: Christophe Varoqui <christophe.varo...@opensvc.com> > Cc: device-mapper development <dm-devel@redhat.com> > Signed-off-by: Xose Vazquez Perez <xose.vazq...@gmail.com> > --- > libmultipath/defaults.h | 1 + > libmultipath/propsel.c | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h > index 9bf27d6..d00a86f 100644 > --- a/libmultipath/defaults.h > +++ b/libmultipath/defaults.h > @@ -31,6 +31,7 @@ > #define DEFAULT_PRIO "const" > #define DEFAULT_PRIO_ARGS "" > #define DEFAULT_CHECKER TUR > +#define DEFAULT_FLUSH FLUSH_DISABLED > > #define DEFAULT_CHECKINT 5 > #define MAX_CHECKINT(a) (a << 2) > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c > index 1625990..88a1916 100644 > --- a/libmultipath/propsel.c > +++ b/libmultipath/propsel.c > @@ -137,7 +137,7 @@ select_rr_weight (struct config *conf, struct > multipath * mp) > mp_set_ovr(rr_weight); > mp_set_hwe(rr_weight); > mp_set_conf(rr_weight); > - mp_set_default(rr_weight, RR_WEIGHT_NONE); > + mp_set_default(rr_weight, DEFAULT_RR_WEIGHT); > out: > print_rr_weight(buff, 13, &mp->rr_weight); > condlog(3, "%s: rr_weight = %s %s", mp->alias, buff, origin); > @@ -550,7 +550,7 @@ select_flush_on_last_del(struct config *conf, struct > multipath *mp) > mp_set_ovr(flush_on_last_del); > mp_set_hwe(flush_on_last_del); > mp_set_conf(flush_on_last_del); > - mp_set_default(flush_on_last_del, FLUSH_DISABLED); > + mp_set_default(flush_on_last_del, DEFAULT_FLUSH); > out: > condlog(3, "%s: flush_on_last_del = %s %s", mp->alias, > (mp->flush_on_last_del == FLUSH_ENABLED)? "yes" : "no", > origin); > -- > 2.10.1 > >
-- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
