850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
80 lines
2.3 KiB
Diff
80 lines
2.3 KiB
Diff
From ed1809969802ba03be0a33b7cd9f0ea85c7a42aa Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
Date: Wed, 29 Mar 2017 11:55:19 -0400
|
|
Subject: [PATCH] mdadm: Clean up some ugly multiple actions on single line
|
|
|
|
'foo(); continue;' on the same line within a switch statement is
|
|
always wrong. Get rid of some of it.
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
mdadm.c | 30 ++++++++++++++++++++----------
|
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/mdadm.c b/mdadm.c
|
|
index 5ebf117..502e721 100644
|
|
--- a/mdadm.c
|
|
+++ b/mdadm.c
|
|
@@ -1928,16 +1928,21 @@ static int misc_list(struct mddev_dev *devlist,
|
|
}
|
|
continue;
|
|
case 'Q':
|
|
- rv |= Query(dv->devname); continue;
|
|
+ rv |= Query(dv->devname);
|
|
+ continue;
|
|
case 'X':
|
|
- rv |= ExamineBitmap(dv->devname, c->brief, ss); continue;
|
|
+ rv |= ExamineBitmap(dv->devname, c->brief, ss);
|
|
+ continue;
|
|
case ExamineBB:
|
|
- rv |= ExamineBadblocks(dv->devname, c->brief, ss); continue;
|
|
+ rv |= ExamineBadblocks(dv->devname, c->brief, ss);
|
|
+ continue;
|
|
case 'W':
|
|
case WaitOpt:
|
|
- rv |= Wait(dv->devname); continue;
|
|
+ rv |= Wait(dv->devname);
|
|
+ continue;
|
|
case Waitclean:
|
|
- rv |= WaitClean(dv->devname, -1, c->verbose); continue;
|
|
+ rv |= WaitClean(dv->devname, -1, c->verbose);
|
|
+ continue;
|
|
case KillSubarray:
|
|
rv |= Kill_subarray(dv->devname, c->subarray, c->verbose);
|
|
continue;
|
|
@@ -1964,7 +1969,8 @@ static int misc_list(struct mddev_dev *devlist,
|
|
switch(dv->devname[0] == '/') {
|
|
case 0:
|
|
mdfd = open_dev(dv->devname);
|
|
- if (mdfd >= 0) break;
|
|
+ if (mdfd >= 0)
|
|
+ break;
|
|
case 1:
|
|
mdfd = open_mddev(dv->devname, 1);
|
|
}
|
|
@@ -1972,13 +1978,17 @@ static int misc_list(struct mddev_dev *devlist,
|
|
switch(dv->disposition) {
|
|
case 'R':
|
|
c->runstop = 1;
|
|
- rv |= Manage_run(dv->devname, mdfd, c); break;
|
|
+ rv |= Manage_run(dv->devname, mdfd, c);
|
|
+ break;
|
|
case 'S':
|
|
- rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); break;
|
|
+ rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0);
|
|
+ break;
|
|
case 'o':
|
|
- rv |= Manage_ro(dv->devname, mdfd, 1); break;
|
|
+ rv |= Manage_ro(dv->devname, mdfd, 1);
|
|
+ break;
|
|
case 'w':
|
|
- rv |= Manage_ro(dv->devname, mdfd, -1); break;
|
|
+ rv |= Manage_ro(dv->devname, mdfd, -1);
|
|
+ break;
|
|
}
|
|
close(mdfd);
|
|
} else
|
|
--
|
|
2.10.2
|
|
|