File 1012-mdmon-don-t-test-both-all-and-container_na... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 1012-mdmon-don-t-test-both-all-and-container_name.patch of Package mdadm

From 96abc0903a91ef23b3da708f04e6ef31b4d3bc50 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 23 Jan 2023 14:25:35 +1100
Subject: [PATCH] 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 it ignore container_name.
This makes the purpose of the code more obvious.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 mdmon.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- a/mdmon.c
+++ b/mdmon.c
@@ -308,7 +308,6 @@ int main(int argc, char *argv[])
 		{"foreground", 0, NULL, 'F'},
 		{NULL, 0, NULL, 0}
 	};
-
 	if (in_initrd()) {
 		/*
 		 * set first char of argv[0] to @. This is used by
@@ -346,10 +345,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (all == 0 && container_name == NULL) {
-		if (argv[optind])
-			container_name = argv[optind];
-	}
+	if (!all && argv[optind])
+		container_name = argv[optind];
 
 	if (container_name == NULL)
 		usage();

Places

File 1012-mdmon-don-t-test-both-all-and-container_name.patch of Package mdadm

Places