multipath-tools: Remove trailing and leading whitespaces
authorXose Vazquez Perez <xose.vazquez@gmail.com>
Fri, 10 Feb 2017 13:43:59 +0000 (14:43 +0100)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Fri, 10 Feb 2017 13:48:49 +0000 (14:48 +0100)
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
kpartx/kpartx_id
libmultipath/dict.c
libmultipath/propsel.c
multipath/multipath.conf.5
multipathd/main.c

index df0e6b9..b7f802d 100755 (executable)
@@ -74,16 +74,16 @@ fi
 if [ -n "$dmdeps" ] ; then
     case "$dmdeps" in
        *\(94,*)
-            echo "DM_TYPE=ccw"
+           echo "DM_TYPE=ccw"
            ;;
        *\(104,* | *\(105,* | *\(106,* | *\(107,* | *\(108,* | *\(109,* | *\(110,* | *\(112,*)
            echo "DM_TYPE=cciss"
            ;;
        *\(9*)
-            echo "DM_TYPE=raid"
+           echo "DM_TYPE=raid"
            ;;
        *)
-            echo "DM_TYPE=scsi"
+           echo "DM_TYPE=scsi"
            echo "DM_WWN=0x${dmname#?}"
            ;;
     esac
index ae94c88..3521c78 100644 (file)
@@ -1426,9 +1426,9 @@ init_keywords(vector keywords)
        install_keyword("config_dir", &def_config_dir_handler, &snprint_def_config_dir);
        install_keyword("delay_watch_checks", &def_delay_watch_checks_handler, &snprint_def_delay_watch_checks);
        install_keyword("delay_wait_checks", &def_delay_wait_checks_handler, &snprint_def_delay_wait_checks);
-        install_keyword("san_path_err_threshold", &def_san_path_err_threshold_handler, &snprint_def_san_path_err_threshold);
-        install_keyword("san_path_err_forget_rate", &def_san_path_err_forget_rate_handler, &snprint_def_san_path_err_forget_rate);
-        install_keyword("san_path_err_recovery_time", &def_san_path_err_recovery_time_handler, &snprint_def_san_path_err_recovery_time);
+       install_keyword("san_path_err_threshold", &def_san_path_err_threshold_handler, &snprint_def_san_path_err_threshold);
+       install_keyword("san_path_err_forget_rate", &def_san_path_err_forget_rate_handler, &snprint_def_san_path_err_forget_rate);
+       install_keyword("san_path_err_recovery_time", &def_san_path_err_recovery_time_handler, &snprint_def_san_path_err_recovery_time);
 
        install_keyword("find_multipaths", &def_find_multipaths_handler, &snprint_def_find_multipaths);
        install_keyword("uxsock_timeout", &def_uxsock_timeout_handler, &snprint_def_uxsock_timeout);
@@ -1512,9 +1512,9 @@ init_keywords(vector keywords)
        install_keyword("deferred_remove", &hw_deferred_remove_handler, &snprint_hw_deferred_remove);
        install_keyword("delay_watch_checks", &hw_delay_watch_checks_handler, &snprint_hw_delay_watch_checks);
        install_keyword("delay_wait_checks", &hw_delay_wait_checks_handler, &snprint_hw_delay_wait_checks);
-        install_keyword("san_path_err_threshold", &hw_san_path_err_threshold_handler, &snprint_hw_san_path_err_threshold);
-        install_keyword("san_path_err_forget_rate", &hw_san_path_err_forget_rate_handler, &snprint_hw_san_path_err_forget_rate);
-        install_keyword("san_path_err_recovery_time", &hw_san_path_err_recovery_time_handler, &snprint_hw_san_path_err_recovery_time);
+       install_keyword("san_path_err_threshold", &hw_san_path_err_threshold_handler, &snprint_hw_san_path_err_threshold);
+       install_keyword("san_path_err_forget_rate", &hw_san_path_err_forget_rate_handler, &snprint_hw_san_path_err_forget_rate);
+       install_keyword("san_path_err_recovery_time", &hw_san_path_err_recovery_time_handler, &snprint_hw_san_path_err_recovery_time);
        install_keyword("skip_kpartx", &hw_skip_kpartx_handler, &snprint_hw_skip_kpartx);
        install_keyword("max_sectors_kb", &hw_max_sectors_kb_handler, &snprint_hw_max_sectors_kb);
        install_sublevel_end();
@@ -1544,9 +1544,9 @@ init_keywords(vector keywords)
        install_keyword("deferred_remove", &ovr_deferred_remove_handler, &snprint_ovr_deferred_remove);
        install_keyword("delay_watch_checks", &ovr_delay_watch_checks_handler, &snprint_ovr_delay_watch_checks);
        install_keyword("delay_wait_checks", &ovr_delay_wait_checks_handler, &snprint_ovr_delay_wait_checks);
-        install_keyword("san_path_err_threshold", &ovr_san_path_err_threshold_handler, &snprint_ovr_san_path_err_threshold);
-        install_keyword("san_path_err_forget_rate", &ovr_san_path_err_forget_rate_handler, &snprint_ovr_san_path_err_forget_rate);
-        install_keyword("san_path_err_recovery_time", &ovr_san_path_err_recovery_time_handler, &snprint_ovr_san_path_err_recovery_time);
+       install_keyword("san_path_err_threshold", &ovr_san_path_err_threshold_handler, &snprint_ovr_san_path_err_threshold);
+       install_keyword("san_path_err_forget_rate", &ovr_san_path_err_forget_rate_handler, &snprint_ovr_san_path_err_forget_rate);
+       install_keyword("san_path_err_recovery_time", &ovr_san_path_err_recovery_time_handler, &snprint_ovr_san_path_err_recovery_time);
 
        install_keyword("skip_kpartx", &ovr_skip_kpartx_handler, &snprint_ovr_skip_kpartx);
        install_keyword("max_sectors_kb", &ovr_max_sectors_kb_handler, &snprint_ovr_max_sectors_kb);
index e4afef7..1b27476 100644 (file)
@@ -645,47 +645,47 @@ out:
 }
 int select_san_path_err_threshold(struct config *conf, struct multipath *mp)
 {
-        char *origin, buff[12];
+       char *origin, buff[12];
 
-        mp_set_mpe(san_path_err_threshold);
-        mp_set_ovr(san_path_err_threshold);
-        mp_set_hwe(san_path_err_threshold);
-        mp_set_conf(san_path_err_threshold);
-        mp_set_default(san_path_err_threshold, DEFAULT_ERR_CHECKS);
+       mp_set_mpe(san_path_err_threshold);
+       mp_set_ovr(san_path_err_threshold);
+       mp_set_hwe(san_path_err_threshold);
+       mp_set_conf(san_path_err_threshold);
+       mp_set_default(san_path_err_threshold, DEFAULT_ERR_CHECKS);
 out:
-        print_off_int_undef(buff, 12, &mp->san_path_err_threshold);
-        condlog(3, "%s: san_path_err_threshold = %s %s", mp->alias, buff, origin);
-        return 0;
+       print_off_int_undef(buff, 12, &mp->san_path_err_threshold);
+       condlog(3, "%s: san_path_err_threshold = %s %s", mp->alias, buff, origin);
+       return 0;
 }
 
 int select_san_path_err_forget_rate(struct config *conf, struct multipath *mp)
 {
-        char *origin, buff[12];
+       char *origin, buff[12];
 
-        mp_set_mpe(san_path_err_forget_rate);
-        mp_set_ovr(san_path_err_forget_rate);
-        mp_set_hwe(san_path_err_forget_rate);
-        mp_set_conf(san_path_err_forget_rate);
-        mp_set_default(san_path_err_forget_rate, DEFAULT_ERR_CHECKS);
+       mp_set_mpe(san_path_err_forget_rate);
+       mp_set_ovr(san_path_err_forget_rate);
+       mp_set_hwe(san_path_err_forget_rate);
+       mp_set_conf(san_path_err_forget_rate);
+       mp_set_default(san_path_err_forget_rate, DEFAULT_ERR_CHECKS);
 out:
-        print_off_int_undef(buff, 12, &mp->san_path_err_forget_rate);
-        condlog(3, "%s: san_path_err_forget_rate = %s %s", mp->alias, buff, origin);
-        return 0;
+       print_off_int_undef(buff, 12, &mp->san_path_err_forget_rate);
+       condlog(3, "%s: san_path_err_forget_rate = %s %s", mp->alias, buff, origin);
+       return 0;
 
 }
 int select_san_path_err_recovery_time(struct config *conf, struct multipath *mp)
 {
-        char *origin, buff[12];
+       char *origin, buff[12];
 
-        mp_set_mpe(san_path_err_recovery_time);
-        mp_set_ovr(san_path_err_recovery_time);
-        mp_set_hwe(san_path_err_recovery_time);
-        mp_set_conf(san_path_err_recovery_time);
-        mp_set_default(san_path_err_recovery_time, DEFAULT_ERR_CHECKS);
+       mp_set_mpe(san_path_err_recovery_time);
+       mp_set_ovr(san_path_err_recovery_time);
+       mp_set_hwe(san_path_err_recovery_time);
+       mp_set_conf(san_path_err_recovery_time);
+       mp_set_default(san_path_err_recovery_time, DEFAULT_ERR_CHECKS);
 out:
-        print_off_int_undef(buff, 12, &mp->san_path_err_recovery_time);
-        condlog(3, "%s: san_path_err_recovery_time = %s %s", mp->alias, buff, origin);
-        return 0;
+       print_off_int_undef(buff, 12, &mp->san_path_err_recovery_time);
+       condlog(3, "%s: san_path_err_recovery_time = %s %s", mp->alias, buff, origin);
+       return 0;
 
 }
 int select_skip_kpartx (struct config *conf, struct multipath * mp)
index 3c564ad..7de8bc7 100644 (file)
@@ -755,7 +755,7 @@ The default is: \fB/etc/multipath/conf.d/\fR
 If set to a value greater than 0, multipathd will watch paths and check how many
 times a path has been failed due to errors.If the number of failures on a particular
 path is greater then the san_path_err_threshold then the path will not  reinstante
-till san_path_err_recovery_time.These path failures should occur within a 
+till san_path_err_recovery_time.These path failures should occur within a
 san_path_err_forget_rate checks, if not we will consider the path is good enough
 to reinstantate.
 .RS
@@ -767,7 +767,7 @@ The default is: \fBno\fR
 .TP
 .B san_path_err_forget_rate
 If set to a value greater than 0, multipathd will check whether the path failures
-has exceeded  the san_path_err_threshold within this many checks i.e 
+has exceeded  the san_path_err_threshold within this many checks i.e
 san_path_err_forget_rate . If so we will not reinstante the path till
 san_path_err_recovery_time.
 .RS
index 1b44e4d..0f32b2c 100644 (file)
@@ -1504,7 +1504,7 @@ static int check_path_reinstate_state(struct path * pp) {
                                (pp->mpp->san_path_err_recovery_time >0))) {
                return 0;
        }
-       
+
        if (pp->disable_reinstate) {
                /* If we don't know how much time has passed, automatically
                 * reinstate the path, just to be safe. Also, if there are