Skip to content

Commit aba6914

Browse files
neilbrownneilbrown
committed
Remove spaces/tabs from ends of lines.
1 parent 08e4337 commit aba6914

23 files changed

+120
-125
lines changed

‎Assemble.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
230230
free(super);
231231
super = NULL;
232232
}
233-
233+
234234
dfd = dev_open(devname, O_RDONLY|O_EXCL);
235235
if (dfd < 0) {
236236
if ((inargv && verbose >= 0) || verbose > 0)
@@ -918,7 +918,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
918918
fprintf(stderr, Name ": no uptodate device for slot %d of %s\n",
919919
i, mddev);
920920
}
921-
921+
922922
if (runstop == 1 ||
923923
(runstop <= 0 &&
924924
( enough(info.array.level, info.array.raid_disks,
@@ -1026,7 +1026,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
10261026
fprintf(stderr, Name ": Cannot start array: %s\n",
10271027
strerror(errno));
10281028
}
1029-
1029+
10301030
}
10311031
if (must_close) close(mdfd);
10321032
return 0;

‎Build.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
114114

115115

116116
vers = md_get_version(mdfd);
117-
117+
118118
/* looks Ok, go for it */
119119
if (vers >= 9000) {
120120
mdu_array_info_t array;
@@ -170,7 +170,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
170170
}
171171
fd = open(dv->devname, O_RDONLY|O_EXCL);
172172
if (fd < 0) {
173-
fprintf(stderr, Name ": Cannot open %s: %s\n",
173+
fprintf(stderr, Name ": Cannot open %s: %s\n",
174174
dv->devname, strerror(errno));
175175
goto abort;
176176
}
@@ -232,7 +232,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
232232
bitmap_file);
233233
return 1;
234234
}
235-
}
235+
}
236236
if (bitmap_fd >= 0) {
237237
if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
238238
fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
@@ -273,5 +273,4 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
273273
else
274274
ioctl(mdfd, STOP_MD, 0);
275275
return 1;
276-
277276
}

‎Create.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
298298
if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY) {
299299
/* size is meaningful */
300300
if (minsize > 0x100000000ULL && st->ss->major == 0) {
301-
fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
301+
fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
302302
return 1;
303303
}
304304
size = minsize;
@@ -348,7 +348,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
348348
Name ": This level does not support missing devices\n");
349349
return 1;
350350
}
351-
351+
352352
/* Ok, lets try some ioctls */
353353

354354
array.level = level;
@@ -467,7 +467,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
467467
inf.major_version = st->ss->major;
468468
inf.minor_version = st->minor_version;
469469
rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
470-
} else
470+
} else
471471
rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
472472
if (rv) {
473473
fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",

‎Detail.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
233233
break;
234234
default: break;
235235
}
236-
236+
237237
if (e && e->percent >= 0) {
238238
printf(" Re%s Status : %d%% complete\n",
239239
(super && info.reshape_active)? "shape":"build",
@@ -301,7 +301,7 @@ This is pretty boring
301301
}
302302
if (disk.major == 0 && disk.minor == 0)
303303
continue;
304-
if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
304+
if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
305305
disks[disk.raid_disk] = disk;
306306
else if (next < max_disks)
307307
disks[next++] = disk;
@@ -319,13 +319,13 @@ This is pretty boring
319319
if (!brief) {
320320
if (d == array.raid_disks) printf("\n");
321321
if (disk.raid_disk < 0)
322-
printf(" %5d %5d %5d - ",
322+
printf(" %5d %5d %5d - ",
323323
disk.number, disk.major, disk.minor);
324324
else
325-
printf(" %5d %5d %5d %5d ",
325+
printf(" %5d %5d %5d %5d ",
326326
disk.number, disk.major, disk.minor, disk.raid_disk);
327-
if (disk.state & (1<<MD_DISK_FAULTY)) {
328-
printf(" faulty");
327+
if (disk.state & (1<<MD_DISK_FAULTY)) {
328+
printf(" faulty");
329329
if (disk.raid_disk < array.raid_disks &&
330330
disk.raid_disk >= 0)
331331
failed++;

‎Examine.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan,
5555
* If (brief) gather devices for same array and just print a mdadm.conf line including devices=
5656
* if devlist==NULL, use conf_get_devs()
5757
*/
58-
int fd;
58+
int fd;
5959
void *super = NULL;
6060
int rv = 0;
6161
int err = 0;

‎Grow.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)
5252
int nfd, fd2;
5353
int d, nd;
5454
struct supertype *st = NULL;
55-
55+
5656

5757
if (ioctl(fd, GET_ARRAY_INFO, &info.array) < 0) {
5858
fprintf(stderr, Name ": cannot get array info for %s\n", devname);
@@ -115,7 +115,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)
115115
/* Ok, looks good. Lets update the superblock and write it out to
116116
* newdev.
117117
*/
118-
118+
119119
info.disk.number = d;
120120
info.disk.major = major(stb.st_rdev);
121121
info.disk.minor = minor(stb.st_rdev);
@@ -179,7 +179,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)
179179

180180
st->ss->update_super(&info, super, "linear-grow-update", dv,
181181
0, 0, NULL);
182-
182+
183183
if (st->ss->store_super(st, fd2, super)) {
184184
fprintf(stderr, Name ": Cannot store new superblock on %s\n", dv);
185185
close(fd2);
@@ -816,7 +816,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
816816
break;
817817
sleep(1);
818818
}
819-
819+
820820
/* invalidate superblocks */
821821
memset(&bsb, 0, sizeof(bsb));
822822
for (i=odisks; i<d ; i++) {

‎Kill.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int Kill(char *dev, int force, int quiet)
4444
void *super;
4545
int fd, rv = 0;
4646
struct supertype *st;
47-
47+
4848
fd = open(dev, O_RDWR|O_EXCL);
4949
if (fd < 0) {
5050
if (!quiet)

‎Manage.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int Manage_ro(char *devname, int fd, int readonly)
4545
*
4646
*/
4747
mdu_array_info_t array;
48-
48+
4949
if (md_get_version(fd) < 9000) {
5050
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
5151
return 1;
@@ -55,7 +55,7 @@ int Manage_ro(char *devname, int fd, int readonly)
5555
devname);
5656
return 1;
5757
}
58-
58+
5959
if (readonly>0) {
6060
if (ioctl(fd, STOP_ARRAY_RO, NULL)) {
6161
fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
@@ -69,7 +69,7 @@ int Manage_ro(char *devname, int fd, int readonly)
6969
return 1;
7070
}
7171
}
72-
return 0;
72+
return 0;
7373
}
7474

7575
#ifndef MDASSEMBLE
@@ -88,7 +88,7 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
8888
return 1;
8989
}
9090
}
91-
91+
9292
if (md_get_version(fd) < 9000) {
9393
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
9494
return 1;
@@ -342,7 +342,7 @@ int Manage_subdevs(char *devname, int fd,
342342
}
343343

344344
/* need to find a sample superblock to copy, and
345-
* a spare slot to use
345+
* a spare slot to use
346346
*/
347347
for (j=0; j<st->max_devs; j++) {
348348
char *dev;
@@ -507,7 +507,7 @@ int Manage_subdevs(char *devname, int fd,
507507
}
508508
}
509509
return 0;
510-
510+
511511
}
512512

513513
int autodetect(void)

‎Monitor.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mailfrom,
3939
char *cmd, int dosyslog);
4040

41-
static char *percentalerts[] = {
41+
static char *percentalerts[] = {
4242
"RebuildStarted",
4343
"Rebuild20",
4444
"Rebuild40",
@@ -291,11 +291,11 @@ int Monitor(mddev_dev_t devlist,
291291
alert("DegradedArray", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
292292

293293
if (st->utime == 0 && /* new array */
294-
st->expected_spares > 0 &&
295-
array.spare_disks < st->expected_spares)
294+
st->expected_spares > 0 &&
295+
array.spare_disks < st->expected_spares)
296296
alert("SparesMissing", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
297297
if (mse &&
298-
st->percent == -1 &&
298+
st->percent == -1 &&
299299
mse->percent >= 0)
300300
alert("RebuildStarted", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
301301
if (mse &&
@@ -401,7 +401,7 @@ int Monitor(mddev_dev_t devlist,
401401
/* now check if there are any new devices found in mdstat */
402402
if (scan) {
403403
struct mdstat_ent *mse;
404-
for (mse=mdstat; mse; mse=mse->next)
404+
for (mse=mdstat; mse; mse=mse->next)
405405
if (mse->devnum != INT_MAX &&
406406
(strcmp(mse->level, "raid0")!=0 &&
407407
strcmp(mse->level, "linear")!=0)
@@ -467,7 +467,7 @@ int Monitor(mddev_dev_t devlist,
467467
}
468468
}
469469
if (dev > 0) {
470-
if (ioctl(fd2, HOT_REMOVE_DISK,
470+
if (ioctl(fd2, HOT_REMOVE_DISK,
471471
(unsigned long)dev) == 0) {
472472
if (ioctl(fd1, HOT_ADD_DISK,
473473
(unsigned long)dev) == 0) {
@@ -504,7 +504,7 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
504504

505505
if (!cmd && !mailaddr) {
506506
time_t now = time(0);
507-
507+
508508
printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
509509
}
510510
if (cmd) {
@@ -520,8 +520,8 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
520520
exit(2);
521521
}
522522
}
523-
if (mailaddr &&
524-
(strncmp(event, "Fail", 4)==0 ||
523+
if (mailaddr &&
524+
(strncmp(event, "Fail", 4)==0 ||
525525
strncmp(event, "Test", 4)==0 ||
526526
strncmp(event, "Spares", 6)==0 ||
527527
strncmp(event, "Degrade", 7)==0)) {

‎Query.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
int Query(char *dev)
3535
{
3636
/* Give a brief description of the device,
37-
* whether it is an md device and whether it has
37+
* whether it is an md device and whether it has
3838
* a superblock
3939
*/
4040
int fd = open(dev, O_RDONLY, 0);
@@ -62,15 +62,15 @@ int Query(char *dev)
6262
if (ioctl(fd, GET_ARRAY_INFO, &array)<0)
6363
ioctlerr = errno;
6464
else ioctlerr = 0;
65-
65+
6666
fstat(fd, &stb);
6767

6868
if (vers>=9000 && !ioctlerr) {
6969
if (!get_dev_size(fd, NULL, &larray_size))
7070
larray_size = 0;
7171
}
7272

73-
if (vers < 0)
73+
if (vers < 0)
7474
printf("%s: is not an md array\n", dev);
7575
else if (vers < 9000)
7676
printf("%s: is an md device, but kernel cannot provide details\n", dev);
@@ -91,7 +91,7 @@ int Query(char *dev)
9191
if (st) {
9292
superror = st->ss->load_super(st, fd, &super, dev);
9393
superrno = errno;
94-
} else
94+
} else
9595
superror = -1;
9696
close(fd);
9797
if (superror == 0) {
@@ -102,7 +102,7 @@ int Query(char *dev)
102102
disc.number = info.disk.number;
103103
activity = "undetected";
104104
if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
105-
if (md_get_version(fd) >= 9000 &&
105+
if (md_get_version(fd) >= 9000 &&
106106
ioctl(fd, GET_ARRAY_INFO, &array)>= 0) {
107107
if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 &&
108108
makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
@@ -117,7 +117,7 @@ int Query(char *dev)
117117
mddev = "array";
118118
}
119119
printf("%s: device %d in %d device %s %s %s. Use mdadm --examine for more detail.\n",
120-
dev,
120+
dev,
121121
info.disk.number, info.array.raid_disks,
122122
activity,
123123
map_num(pers, info.array.level),
@@ -128,4 +128,3 @@ int Query(char *dev)
128128
return 0;
129129
}
130130

131-

‎ReadMe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ struct option long_options[] = {
110110

111111
/* synonyms */
112112
{"monitor", 0, 0, 'F'},
113-
113+
114114
/* after those will normally come the name of the md device */
115115
{"help", 0, 0, 'h'},
116116
{"help-options",0,0,'h'},

‎bitmap.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
152152
skip = sizeof(info->sb);
153153

154154
sb_le_to_cpu(&info->sb); /* convert superblock to CPU byte ordering */
155-
155+
156156
if (brief || info->sb.sync_size == 0)
157157
goto out;
158158

@@ -219,7 +219,7 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **st
219219
if (!st) {
220220
/* just look at device... */
221221
lseek(fd, 0, 0);
222-
} else {
222+
} else {
223223
st->ss->locate_bitmap(st, fd, NULL);
224224
}
225225
ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
@@ -398,7 +398,7 @@ int CreateBitmap(char *filename, int force, char uuid[16],
398398
}
399399
bytes -= sizeof(block);
400400
}
401-
401+
402402
rv = 0;
403403
fflush(fp);
404404
/* make the file be the right size (well, to the nearest byte) */

0 commit comments

Comments
 (0)