Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jes Sorensen 2017-03-29 11:55:19 -04:00
parent aa31311836
commit ed18099698
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mdadm.c
View File

@ -1928,16 +1928,21 @@ static int misc_list(struct mddev_dev *devlist,
} }
continue; continue;
case 'Q': case 'Q':
rv |= Query(dv->devname); continue; rv |= Query(dv->devname);
continue;
case 'X': case 'X':
rv |= ExamineBitmap(dv->devname, c->brief, ss); continue; rv |= ExamineBitmap(dv->devname, c->brief, ss);
continue;
case ExamineBB: case ExamineBB:
rv |= ExamineBadblocks(dv->devname, c->brief, ss); continue; rv |= ExamineBadblocks(dv->devname, c->brief, ss);
continue;
case 'W': case 'W':
case WaitOpt: case WaitOpt:
rv |= Wait(dv->devname); continue; rv |= Wait(dv->devname);
continue;
case Waitclean: case Waitclean:
rv |= WaitClean(dv->devname, -1, c->verbose); continue; rv |= WaitClean(dv->devname, -1, c->verbose);
continue;
case KillSubarray: case KillSubarray:
rv |= Kill_subarray(dv->devname, c->subarray, c->verbose); rv |= Kill_subarray(dv->devname, c->subarray, c->verbose);
continue; continue;
@ -1964,7 +1969,8 @@ static int misc_list(struct mddev_dev *devlist,
switch(dv->devname[0] == '/') { switch(dv->devname[0] == '/') {
case 0: case 0:
mdfd = open_dev(dv->devname); mdfd = open_dev(dv->devname);
if (mdfd >= 0) break; if (mdfd >= 0)
break;
case 1: case 1:
mdfd = open_mddev(dv->devname, 1); mdfd = open_mddev(dv->devname, 1);
} }
@ -1972,13 +1978,17 @@ static int misc_list(struct mddev_dev *devlist,
switch(dv->disposition) { switch(dv->disposition) {
case 'R': case 'R':
c->runstop = 1; c->runstop = 1;
rv |= Manage_run(dv->devname, mdfd, c); break; rv |= Manage_run(dv->devname, mdfd, c);
break;
case 'S': case 'S':
rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); break; rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0);
break;
case 'o': case 'o':
rv |= Manage_ro(dv->devname, mdfd, 1); break; rv |= Manage_ro(dv->devname, mdfd, 1);
break;
case 'w': case 'w':
rv |= Manage_ro(dv->devname, mdfd, -1); break; rv |= Manage_ro(dv->devname, mdfd, -1);
break;
} }
close(mdfd); close(mdfd);
} else } else