Revert "mdadm: fix coredump of mdadm --monitor -r"
PATCH 3/6 Revert "mdadm: fix coredump of mdadm --monitor -r"
This reverts commit 546047688e1c64638f462147c755b58119cabdc8.
546047688e1c made -r require parameter in monitor mode but this inadvertently broke -r option in "manage" mode which is used for removing devices that are either spare or in faulty mode resulting in some of the test cases to fail.
Reverting 546047688e1c is safe as the core dump issue that was fixed by this commit is addressed by 60815698c0ac where parsing failures are handled better.
Signed-off-by Sudhakar Panneerselvam <[email protected]>
--- ReadMe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
ReadMe.c +3 -3
@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";* found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k" ; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_auto_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ;struct option long_options[] = { {"manage" ,0 ,0 , ManageOpt},
Signature · 1 line
1.8.3.1