| Message ID | 1537571127-10143-17-git-send-email-bmarzins@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | Misc Multipath patches | expand |
On Fri, 2018-09-21 at 18:05 -0500, Benjamin Marzinski wrote: > The only thing this patch changes is to remove the check for pp->mpp > before the check for pp->mpp->prflags, since check_path() already > verified that pp->mpp != NULL. This fixes a number of coverity > warnings. > Also, I normalized the spacing and indenting of the nearby code. > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Reviewed-by: Martin Wilck <mwilck@suse.com> > --- > multipathd/main.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/multipathd/main.c b/multipathd/main.c > index 125a805..3c2fe7b 100644 > --- a/multipathd/main.c > +++ b/multipathd/main.c > @@ -1978,14 +1978,14 @@ check_path (struct vectors * vecs, struct > path * pp, int ticks) > return 1; > } > > - if(newstate == PATH_UP || newstate == PATH_GHOST){ > - if ( pp->mpp && pp->mpp->prflag ){ > + if (newstate == PATH_UP || newstate == PATH_GHOST) { > + if (pp->mpp->prflag) { > /* > * Check Persistent Reservation. > */ > - condlog(2, "%s: checking persistent reservation > " > - "registration", pp->dev); > - mpath_pr_event_handle(pp); > + condlog(2, "%s: checking persistent " > + "reservation registration", pp- > >dev); > + mpath_pr_event_handle(pp); > } > } >
diff --git a/multipathd/main.c b/multipathd/main.c index 125a805..3c2fe7b 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -1978,14 +1978,14 @@ check_path (struct vectors * vecs, struct path * pp, int ticks) return 1; } - if(newstate == PATH_UP || newstate == PATH_GHOST){ - if ( pp->mpp && pp->mpp->prflag ){ + if (newstate == PATH_UP || newstate == PATH_GHOST) { + if (pp->mpp->prflag) { /* * Check Persistent Reservation. */ - condlog(2, "%s: checking persistent reservation " - "registration", pp->dev); - mpath_pr_event_handle(pp); + condlog(2, "%s: checking persistent " + "reservation registration", pp->dev); + mpath_pr_event_handle(pp); } }
The only thing this patch changes is to remove the check for pp->mpp before the check for pp->mpp->prflags, since check_path() already verified that pp->mpp != NULL. This fixes a number of coverity warnings. Also, I normalized the spacing and indenting of the nearby code. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- multipathd/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)