diff mbox

[v2,01/20] Revert "multipath: ignore -i if find_multipaths is set"

Message ID 20180319150155.5363-2-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show

Commit Message

Martin Wilck March 19, 2018, 3:01 p.m. UTC
This reverts commit ffbb886a8a16cb063d669cd76a1e656fd3ec8c4b.

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 multipath/main.c | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Benjamin Marzinski March 23, 2018, 5:51 p.m. UTC | #1
On Mon, Mar 19, 2018 at 04:01:36PM +0100, Martin Wilck wrote:
> This reverts commit ffbb886a8a16cb063d669cd76a1e656fd3ec8c4b.
> 
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
>  multipath/main.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/multipath/main.c b/multipath/main.c
> index 716203eab56c..20f46acd924a 100644
> --- a/multipath/main.c
> +++ b/multipath/main.c
> @@ -776,16 +776,6 @@ main (int argc, char *argv[])
>  		}
>  	}
>  
> -	/*
> -	 * FIXME: new device detection with find_multipaths currently
> -	 * doesn't work reliably.
> -	 */
> -	if (cmd ==  CMD_VALID_PATH &&
> -	    conf->find_multipaths && conf->ignore_wwids) {
> -		condlog(2, "ignoring -i flag because find_multipath is set in multipath.conf");
> -		conf->ignore_wwids = 0;
> -	}
> -
>  	if (getuid() != 0) {
>  		fprintf(stderr, "need to be root\n");
>  		exit(1);
> -- 
> 2.16.1

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
diff mbox

Patch

diff --git a/multipath/main.c b/multipath/main.c
index 716203eab56c..20f46acd924a 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -776,16 +776,6 @@  main (int argc, char *argv[])
 		}
 	}
 
-	/*
-	 * FIXME: new device detection with find_multipaths currently
-	 * doesn't work reliably.
-	 */
-	if (cmd ==  CMD_VALID_PATH &&
-	    conf->find_multipaths && conf->ignore_wwids) {
-		condlog(2, "ignoring -i flag because find_multipath is set in multipath.conf");
-		conf->ignore_wwids = 0;
-	}
-
 	if (getuid() != 0) {
 		fprintf(stderr, "need to be root\n");
 		exit(1);