From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Benjamin Marzinski" <bmarzins@redhat.com>
Subject: Re: [PATCH v5 17/22] multipath -u: cleanup logic
Date: Mon, 16 Apr 2018 15:52:11 -0500
Message-ID: <20180416205211.GI3103@octiron.msp.redhat.com>
References: <20180413220015.7032-1-mwilck@suse.com>
	<20180413220015.7032-18-mwilck@suse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dm-devel-bounces@redhat.com>
Content-Disposition: inline
In-Reply-To: <20180413220015.7032-18-mwilck@suse.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com
To: Martin Wilck <mwilck@suse.com>
Cc: dm-devel@redhat.com
List-Id: dm-devel.ids

On Sat, Apr 14, 2018 at 12:00:10AM +0200, Martin Wilck wrote:
> The CMD_VALID_PATH logic is complex and hard to read and understand.
> This patch cleans it up a bit (preparing for folluw-up patches).
> It doesn't change any logic.
> 
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
>  multipath/main.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/multipath/main.c b/multipath/main.c
> index 5d847f08..61ba90a6 100644
> --- a/multipath/main.c
> +++ b/multipath/main.c
> @@ -585,15 +585,17 @@ configure (struct config *conf, enum mpath_cmds cmd,
>  			if (is_failed_wwid(refwwid) == WWID_IS_FAILED) {
>  				r = 1;
>  				goto print_valid;
> -			} else if ((!find_multipaths_on(conf) &&
> +			}
> +			if ((!find_multipaths_on(conf) &&
>  				    ignore_wwids_on(conf)) ||
>  				   check_wwids_file(refwwid, 0) == 0)
>  				r = 0;
> -			if (r == 0 ||
> -			    !find_multipaths_on(conf) ||
> -			    !ignore_wwids_on(conf)) {
> +			if (!ignore_wwids_on(conf))
>  				goto print_valid;
> -			}
> +			/* At this point, either r==0 or find_multipaths_on. */
> +			if (r == 0)
> +				goto print_valid;
> +			/* find_multipaths_on: Fall through to path detection */
>  		}
>  	}
>  
> -- 
> 2.16.1