mdmon: don't test both 'all' and 'container_name'.

If 'all' is not set, then container_name must be NULL, as nothing else
can set it.  So simplify the test to ignore container_name.
This makes the purpose of the code more obvious.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

diff --git a/mdmon.c b/mdmon.c
index 60ba318253b995ad0a22b9948523d43fa1800b8f..f8fd2f0f44c4f5194c9a6124af5f82aa5935af44 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -352,7 +352,6 @@ int main(int argc, char *argv[])
                }
        }
 
-
        if (in_initrd()) {
                /*
                 * set first char of argv[0] to @. This is used by
@@ -362,12 +361,10 @@ int main(int argc, char *argv[])
                argv[0][0] = '@';
        }
 
-       if (all == 0 && container_name == NULL) {
-               if (argv[optind]) {
-                       container_name = get_md_name(argv[optind]);
-                       if (!container_name)
-                               return 1;
-               }
+       if (!all && argv[optind]) {
+               container_name = get_md_name(argv[optind]);
+               if (!container_name)
+                       return 1;
        }
 
        if (container_name == NULL || argc - optind > 1)