| Message ID | 20210522191736.62042-1-xose.vazquez@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | multipath-tools: Remove trailing/leading whitespaces | expand |
On Sat, May 22, 2021 at 09:17:36PM +0200, Xose Vazquez Perez wrote: > Cc: Martin Wilck <mwilck@suse.com> > Cc: Benjamin Marzinski <bmarzins@redhat.com> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com> > Cc: DM-DEVEL ML <dm-devel@redhat.com> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> If no one objects, I'm fine with this going in. But if anyone has objections to a whitespace only patch, I'm o.k. with this not going in as well. -Ben > --- > Makefile.inc | 2 +- > libmultipath/configure.c | 2 +- > libmultipath/devmapper.c | 4 ++-- > libmultipath/sysfs.c | 2 +- > multipath/multipath.8 | 2 +- > multipathd/cli_handlers.c | 2 +- > multipathd/main.c | 2 +- > 7 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Makefile.inc b/Makefile.inc > index 91100a20..d0ec9b44 100644 > --- a/Makefile.inc > +++ b/Makefile.inc > @@ -101,7 +101,7 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 > WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ > -Werror=implicit-function-declaration -Werror=format-security \ > $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) > -CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 > +CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 > CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ > -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ > -MMD -MP > diff --git a/libmultipath/configure.c b/libmultipath/configure.c > index 6ca1f4bb..a6ae3359 100644 > --- a/libmultipath/configure.c > +++ b/libmultipath/configure.c > @@ -397,7 +397,7 @@ int setup_map(struct multipath *mpp, char *params, int params_size, > start_io_err_stat_thread(vecs); > > n_paths = VECTOR_SIZE(mpp->paths); > - /* > + /* > * assign paths to path groups -- start with no groups and all paths > * in mpp->paths > */ > diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c > index 095cbc0c..98ec2a58 100644 > --- a/libmultipath/devmapper.c > +++ b/libmultipath/devmapper.c > @@ -598,8 +598,8 @@ int dm_addmap_reload(struct multipath *mpp, char *params, int flush) > return r; > > /* If the resume failed, dm will leave the device suspended, and > - * drop the new table, so doing a second resume will try using > - * the original table */ > + * drop the new table, so doing a second resume will try using > + * the original table */ > if (dm_is_suspended(mpp->alias)) > dm_simplecmd(DM_DEVICE_RESUME, mpp->alias, !flush, 1, > udev_flags, 0); > diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c > index 7a2af1ea..9ff145f2 100644 > --- a/libmultipath/sysfs.c > +++ b/libmultipath/sysfs.c > @@ -358,7 +358,7 @@ bool sysfs_is_multipathed(struct path *pp, bool set_wwid) > strchop(pp->wwid); > } > } > - } else if (nr < 0) > + } else if (nr < 0) > condlog(1, "%s: error reading from %s: %m", > __func__, pathbuf); > > diff --git a/multipath/multipath.8 b/multipath/multipath.8 > index 5b29a5d9..17df59f5 100644 > --- a/multipath/multipath.8 > +++ b/multipath/multipath.8 > @@ -225,7 +225,7 @@ Dry run, do not create or update devmaps. > .TP > .B \-e > Enable all foreign libraries. This overrides the > -.I enable_foreign > +.I enable_foreign > option from \fBmultipath.conf(5)\fR. > . > .TP > diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c > index 59d44b45..d70e1dbc 100644 > --- a/multipathd/cli_handlers.c > +++ b/multipathd/cli_handlers.c > @@ -1215,7 +1215,7 @@ cli_reconfigure(void * v, char ** reply, int * len, void * data) > > condlog(2, "reconfigure (operator)"); > > - rc = set_config_state(DAEMON_CONFIGURE); > + rc = set_config_state(DAEMON_CONFIGURE); > if (rc == ETIMEDOUT) { > condlog(2, "timeout starting reconfiguration"); > return 1; > diff --git a/multipathd/main.c b/multipathd/main.c > index 2251e02c..bdd629e7 100644 > --- a/multipathd/main.c > +++ b/multipathd/main.c > @@ -2014,7 +2014,7 @@ static int check_path_reinstate_state(struct path * pp) { > > /* If path became failed again or continue failed, should reset > * path san_path_err_forget_rate and path dis_reinstate_time to > - * start a new stable check. > + * start a new stable check. > */ > if ((pp->state != PATH_UP) && (pp->state != PATH_GHOST) && > (pp->state != PATH_DELAYED)) { > -- > 2.31.1 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On Mo, 2021-05-24 at 11:03 -0500, Benjamin Marzinski wrote: > On Sat, May 22, 2021 at 09:17:36PM +0200, Xose Vazquez Perez wrote: > > Cc: Martin Wilck <mwilck@suse.com> > > Cc: Benjamin Marzinski <bmarzins@redhat.com> > > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com> > > Cc: DM-DEVEL ML <dm-devel@redhat.com> > > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> > > If no one objects, I'm fine with this going in. But if anyone has > objections to a whitespace only patch, I'm o.k. with this not going > in > as well. I'm fine with this, as long as we don't get another patch of this kind every other day. Martin -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On Sa, 2021-05-22 at 21:17 +0200, Xose Vazquez Perez wrote: > Cc: Martin Wilck <mwilck@suse.com> > Cc: Benjamin Marzinski <bmarzins@redhat.com> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com> > Cc: DM-DEVEL ML <dm-devel@redhat.com> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> Reviewed-by: Martin Wilck <mwilck@suse.com> -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
diff --git a/Makefile.inc b/Makefile.inc index 91100a20..d0ec9b44 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -101,7 +101,7 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ -Werror=implicit-function-declaration -Werror=format-security \ $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) -CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 +CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ -MMD -MP diff --git a/libmultipath/configure.c b/libmultipath/configure.c index 6ca1f4bb..a6ae3359 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -397,7 +397,7 @@ int setup_map(struct multipath *mpp, char *params, int params_size, start_io_err_stat_thread(vecs); n_paths = VECTOR_SIZE(mpp->paths); - /* + /* * assign paths to path groups -- start with no groups and all paths * in mpp->paths */ diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 095cbc0c..98ec2a58 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -598,8 +598,8 @@ int dm_addmap_reload(struct multipath *mpp, char *params, int flush) return r; /* If the resume failed, dm will leave the device suspended, and - * drop the new table, so doing a second resume will try using - * the original table */ + * drop the new table, so doing a second resume will try using + * the original table */ if (dm_is_suspended(mpp->alias)) dm_simplecmd(DM_DEVICE_RESUME, mpp->alias, !flush, 1, udev_flags, 0); diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c index 7a2af1ea..9ff145f2 100644 --- a/libmultipath/sysfs.c +++ b/libmultipath/sysfs.c @@ -358,7 +358,7 @@ bool sysfs_is_multipathed(struct path *pp, bool set_wwid) strchop(pp->wwid); } } - } else if (nr < 0) + } else if (nr < 0) condlog(1, "%s: error reading from %s: %m", __func__, pathbuf); diff --git a/multipath/multipath.8 b/multipath/multipath.8 index 5b29a5d9..17df59f5 100644 --- a/multipath/multipath.8 +++ b/multipath/multipath.8 @@ -225,7 +225,7 @@ Dry run, do not create or update devmaps. .TP .B \-e Enable all foreign libraries. This overrides the -.I enable_foreign +.I enable_foreign option from \fBmultipath.conf(5)\fR. . .TP diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index 59d44b45..d70e1dbc 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -1215,7 +1215,7 @@ cli_reconfigure(void * v, char ** reply, int * len, void * data) condlog(2, "reconfigure (operator)"); - rc = set_config_state(DAEMON_CONFIGURE); + rc = set_config_state(DAEMON_CONFIGURE); if (rc == ETIMEDOUT) { condlog(2, "timeout starting reconfiguration"); return 1; diff --git a/multipathd/main.c b/multipathd/main.c index 2251e02c..bdd629e7 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2014,7 +2014,7 @@ static int check_path_reinstate_state(struct path * pp) { /* If path became failed again or continue failed, should reset * path san_path_err_forget_rate and path dis_reinstate_time to - * start a new stable check. + * start a new stable check. */ if ((pp->state != PATH_UP) && (pp->state != PATH_GHOST) && (pp->state != PATH_DELAYED)) {
Cc: Martin Wilck <mwilck@suse.com> Cc: Benjamin Marzinski <bmarzins@redhat.com> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com> Cc: DM-DEVEL ML <dm-devel@redhat.com> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> --- Makefile.inc | 2 +- libmultipath/configure.c | 2 +- libmultipath/devmapper.c | 4 ++-- libmultipath/sysfs.c | 2 +- multipath/multipath.8 | 2 +- multipathd/cli_handlers.c | 2 +- multipathd/main.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)