|
 |
2c1b57 |
From ed1809969802ba03be0a33b7cd9f0ea85c7a42aa Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
2c1b57 |
Date: Wed, 29 Mar 2017 11:55:19 -0400
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 033/169] mdadm: Clean up some ugly multiple
|
|
|
2c1b57 |
actions on single line
|
|
|
2c1b57 |
|
|
|
2c1b57 |
'foo(); continue;' on the same line within a switch statement is
|
|
|
2c1b57 |
always wrong. Get rid of some of it.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
mdadm.c | 30 ++++++++++++++++++++----------
|
|
|
2c1b57 |
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/mdadm.c b/mdadm.c
|
|
|
2c1b57 |
index 5ebf117..502e721 100644
|
|
|
2c1b57 |
--- a/mdadm.c
|
|
|
2c1b57 |
+++ b/mdadm.c
|
|
|
2c1b57 |
@@ -1928,16 +1928,21 @@ static int misc_list(struct mddev_dev *devlist,
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
continue;
|
|
|
2c1b57 |
case 'Q':
|
|
|
2c1b57 |
- rv |= Query(dv->devname); continue;
|
|
|
2c1b57 |
+ rv |= Query(dv->devname);
|
|
|
2c1b57 |
+ continue;
|
|
|
2c1b57 |
case 'X':
|
|
|
2c1b57 |
- rv |= ExamineBitmap(dv->devname, c->brief, ss); continue;
|
|
|
2c1b57 |
+ rv |= ExamineBitmap(dv->devname, c->brief, ss);
|
|
|
2c1b57 |
+ continue;
|
|
|
2c1b57 |
case ExamineBB:
|
|
|
2c1b57 |
- rv |= ExamineBadblocks(dv->devname, c->brief, ss); continue;
|
|
|
2c1b57 |
+ rv |= ExamineBadblocks(dv->devname, c->brief, ss);
|
|
|
2c1b57 |
+ continue;
|
|
|
2c1b57 |
case 'W':
|
|
|
2c1b57 |
case WaitOpt:
|
|
|
2c1b57 |
- rv |= Wait(dv->devname); continue;
|
|
|
2c1b57 |
+ rv |= Wait(dv->devname);
|
|
|
2c1b57 |
+ continue;
|
|
|
2c1b57 |
case Waitclean:
|
|
|
2c1b57 |
- rv |= WaitClean(dv->devname, -1, c->verbose); continue;
|
|
|
2c1b57 |
+ rv |= WaitClean(dv->devname, -1, c->verbose);
|
|
|
2c1b57 |
+ continue;
|
|
|
2c1b57 |
case KillSubarray:
|
|
|
2c1b57 |
rv |= Kill_subarray(dv->devname, c->subarray, c->verbose);
|
|
|
2c1b57 |
continue;
|
|
|
2c1b57 |
@@ -1964,7 +1969,8 @@ static int misc_list(struct mddev_dev *devlist,
|
|
|
2c1b57 |
switch(dv->devname[0] == '/') {
|
|
|
2c1b57 |
case 0:
|
|
|
2c1b57 |
mdfd = open_dev(dv->devname);
|
|
|
2c1b57 |
- if (mdfd >= 0) break;
|
|
|
2c1b57 |
+ if (mdfd >= 0)
|
|
|
2c1b57 |
+ break;
|
|
|
2c1b57 |
case 1:
|
|
|
2c1b57 |
mdfd = open_mddev(dv->devname, 1);
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
@@ -1972,13 +1978,17 @@ static int misc_list(struct mddev_dev *devlist,
|
|
|
2c1b57 |
switch(dv->disposition) {
|
|
|
2c1b57 |
case 'R':
|
|
|
2c1b57 |
c->runstop = 1;
|
|
|
2c1b57 |
- rv |= Manage_run(dv->devname, mdfd, c); break;
|
|
|
2c1b57 |
+ rv |= Manage_run(dv->devname, mdfd, c);
|
|
|
2c1b57 |
+ break;
|
|
|
2c1b57 |
case 'S':
|
|
|
2c1b57 |
- rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); break;
|
|
|
2c1b57 |
+ rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0);
|
|
|
2c1b57 |
+ break;
|
|
|
2c1b57 |
case 'o':
|
|
|
2c1b57 |
- rv |= Manage_ro(dv->devname, mdfd, 1); break;
|
|
|
2c1b57 |
+ rv |= Manage_ro(dv->devname, mdfd, 1);
|
|
|
2c1b57 |
+ break;
|
|
|
2c1b57 |
case 'w':
|
|
|
2c1b57 |
- rv |= Manage_ro(dv->devname, mdfd, -1); break;
|
|
|
2c1b57 |
+ rv |= Manage_ro(dv->devname, mdfd, -1);
|
|
|
2c1b57 |
+ break;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
close(mdfd);
|
|
|
2c1b57 |
} else
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|