Skip to content

Commit

Permalink
Remove spaces/tabs from ends of lines.
Browse files Browse the repository at this point in the history
  • Loading branch information
neilbrown committed Dec 14, 2007
1 parent 08e4337 commit aba6914
Show file tree
Hide file tree
Showing 23 changed files with 120 additions and 125 deletions.
6 changes: 3 additions & 3 deletions Assemble.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
free(super);
super = NULL;
}

dfd = dev_open(devname, O_RDONLY|O_EXCL);
if (dfd < 0) {
if ((inargv && verbose >= 0) || verbose > 0)
Expand Down Expand Up @@ -918,7 +918,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
fprintf(stderr, Name ": no uptodate device for slot %d of %s\n",
i, mddev);
}

if (runstop == 1 ||
(runstop <= 0 &&
( enough(info.array.level, info.array.raid_disks,
Expand Down Expand Up @@ -1026,7 +1026,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
fprintf(stderr, Name ": Cannot start array: %s\n",
strerror(errno));
}

}
if (must_close) close(mdfd);
return 0;
Expand Down
7 changes: 3 additions & 4 deletions Build.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,


vers = md_get_version(mdfd);

/* looks Ok, go for it */
if (vers >= 9000) {
mdu_array_info_t array;
Expand Down Expand Up @@ -170,7 +170,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
}
fd = open(dv->devname, O_RDONLY|O_EXCL);
if (fd < 0) {
fprintf(stderr, Name ": Cannot open %s: %s\n",
fprintf(stderr, Name ": Cannot open %s: %s\n",
dv->devname, strerror(errno));
goto abort;
}
Expand Down Expand Up @@ -232,7 +232,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
bitmap_file);
return 1;
}
}
}
if (bitmap_fd >= 0) {
if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
Expand Down Expand Up @@ -273,5 +273,4 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
else
ioctl(mdfd, STOP_MD, 0);
return 1;

}
6 changes: 3 additions & 3 deletions Create.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY) {
/* size is meaningful */
if (minsize > 0x100000000ULL && st->ss->major == 0) {
fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
return 1;
}
size = minsize;
Expand Down Expand Up @@ -348,7 +348,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
Name ": This level does not support missing devices\n");
return 1;
}

/* Ok, lets try some ioctls */

array.level = level;
Expand Down Expand Up @@ -467,7 +467,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
inf.major_version = st->ss->major;
inf.minor_version = st->minor_version;
rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
} else
} else
rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
if (rv) {
fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
Expand Down
12 changes: 6 additions & 6 deletions Detail.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
break;
default: break;
}

if (e && e->percent >= 0) {
printf(" Re%s Status : %d%% complete\n",
(super && info.reshape_active)? "shape":"build",
Expand Down Expand Up @@ -301,7 +301,7 @@ This is pretty boring
}
if (disk.major == 0 && disk.minor == 0)
continue;
if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
disks[disk.raid_disk] = disk;
else if (next < max_disks)
disks[next++] = disk;
Expand All @@ -319,13 +319,13 @@ This is pretty boring
if (!brief) {
if (d == array.raid_disks) printf("\n");
if (disk.raid_disk < 0)
printf(" %5d %5d %5d - ",
printf(" %5d %5d %5d - ",
disk.number, disk.major, disk.minor);
else
printf(" %5d %5d %5d %5d ",
printf(" %5d %5d %5d %5d ",
disk.number, disk.major, disk.minor, disk.raid_disk);
if (disk.state & (1<<MD_DISK_FAULTY)) {
printf(" faulty");
if (disk.state & (1<<MD_DISK_FAULTY)) {
printf(" faulty");
if (disk.raid_disk < array.raid_disks &&
disk.raid_disk >= 0)
failed++;
Expand Down
2 changes: 1 addition & 1 deletion Examine.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int Examine(mddev_dev_t devlist, int brief, int scan,
* If (brief) gather devices for same array and just print a mdadm.conf line including devices=
* if devlist==NULL, use conf_get_devs()
*/
int fd;
int fd;
void *super = NULL;
int rv = 0;
int err = 0;
Expand Down
8 changes: 4 additions & 4 deletions Grow.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)
int nfd, fd2;
int d, nd;
struct supertype *st = NULL;


if (ioctl(fd, GET_ARRAY_INFO, &info.array) < 0) {
fprintf(stderr, Name ": cannot get array info for %s\n", devname);
Expand Down Expand Up @@ -115,7 +115,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)
/* Ok, looks good. Lets update the superblock and write it out to
* newdev.
*/

info.disk.number = d;
info.disk.major = major(stb.st_rdev);
info.disk.minor = minor(stb.st_rdev);
Expand Down Expand Up @@ -179,7 +179,7 @@ int Grow_Add_device(char *devname, int fd, char *newdev)

st->ss->update_super(&info, super, "linear-grow-update", dv,
0, 0, NULL);

if (st->ss->store_super(st, fd2, super)) {
fprintf(stderr, Name ": Cannot store new superblock on %s\n", dv);
close(fd2);
Expand Down Expand Up @@ -816,7 +816,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
break;
sleep(1);
}

/* invalidate superblocks */
memset(&bsb, 0, sizeof(bsb));
for (i=odisks; i<d ; i++) {
Expand Down
2 changes: 1 addition & 1 deletion Kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int Kill(char *dev, int force, int quiet)
void *super;
int fd, rv = 0;
struct supertype *st;

fd = open(dev, O_RDWR|O_EXCL);
if (fd < 0) {
if (!quiet)
Expand Down
12 changes: 6 additions & 6 deletions Manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ int Manage_ro(char *devname, int fd, int readonly)
*
*/
mdu_array_info_t array;

if (md_get_version(fd) < 9000) {
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
return 1;
Expand All @@ -55,7 +55,7 @@ int Manage_ro(char *devname, int fd, int readonly)
devname);
return 1;
}

if (readonly>0) {
if (ioctl(fd, STOP_ARRAY_RO, NULL)) {
fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
Expand All @@ -69,7 +69,7 @@ int Manage_ro(char *devname, int fd, int readonly)
return 1;
}
}
return 0;
return 0;
}

#ifndef MDASSEMBLE
Expand All @@ -88,7 +88,7 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
return 1;
}
}

if (md_get_version(fd) < 9000) {
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
return 1;
Expand Down Expand Up @@ -342,7 +342,7 @@ int Manage_subdevs(char *devname, int fd,
}

/* need to find a sample superblock to copy, and
* a spare slot to use
* a spare slot to use
*/
for (j=0; j<st->max_devs; j++) {
char *dev;
Expand Down Expand Up @@ -507,7 +507,7 @@ int Manage_subdevs(char *devname, int fd,
}
}
return 0;

}

int autodetect(void)
Expand Down
18 changes: 9 additions & 9 deletions Monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mailfrom,
char *cmd, int dosyslog);

static char *percentalerts[] = {
static char *percentalerts[] = {
"RebuildStarted",
"Rebuild20",
"Rebuild40",
Expand Down Expand Up @@ -291,11 +291,11 @@ int Monitor(mddev_dev_t devlist,
alert("DegradedArray", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);

if (st->utime == 0 && /* new array */
st->expected_spares > 0 &&
array.spare_disks < st->expected_spares)
st->expected_spares > 0 &&
array.spare_disks < st->expected_spares)
alert("SparesMissing", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
if (mse &&
st->percent == -1 &&
st->percent == -1 &&
mse->percent >= 0)
alert("RebuildStarted", dev, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
if (mse &&
Expand Down Expand Up @@ -401,7 +401,7 @@ int Monitor(mddev_dev_t devlist,
/* now check if there are any new devices found in mdstat */
if (scan) {
struct mdstat_ent *mse;
for (mse=mdstat; mse; mse=mse->next)
for (mse=mdstat; mse; mse=mse->next)
if (mse->devnum != INT_MAX &&
(strcmp(mse->level, "raid0")!=0 &&
strcmp(mse->level, "linear")!=0)
Expand Down Expand Up @@ -467,7 +467,7 @@ int Monitor(mddev_dev_t devlist,
}
}
if (dev > 0) {
if (ioctl(fd2, HOT_REMOVE_DISK,
if (ioctl(fd2, HOT_REMOVE_DISK,
(unsigned long)dev) == 0) {
if (ioctl(fd1, HOT_ADD_DISK,
(unsigned long)dev) == 0) {
Expand Down Expand Up @@ -504,7 +504,7 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail

if (!cmd && !mailaddr) {
time_t now = time(0);

printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
}
if (cmd) {
Expand All @@ -520,8 +520,8 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
exit(2);
}
}
if (mailaddr &&
(strncmp(event, "Fail", 4)==0 ||
if (mailaddr &&
(strncmp(event, "Fail", 4)==0 ||
strncmp(event, "Test", 4)==0 ||
strncmp(event, "Spares", 6)==0 ||
strncmp(event, "Degrade", 7)==0)) {
Expand Down
13 changes: 6 additions & 7 deletions Query.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
int Query(char *dev)
{
/* Give a brief description of the device,
* whether it is an md device and whether it has
* whether it is an md device and whether it has
* a superblock
*/
int fd = open(dev, O_RDONLY, 0);
Expand Down Expand Up @@ -62,15 +62,15 @@ int Query(char *dev)
if (ioctl(fd, GET_ARRAY_INFO, &array)<0)
ioctlerr = errno;
else ioctlerr = 0;

fstat(fd, &stb);

if (vers>=9000 && !ioctlerr) {
if (!get_dev_size(fd, NULL, &larray_size))
larray_size = 0;
}

if (vers < 0)
if (vers < 0)
printf("%s: is not an md array\n", dev);
else if (vers < 9000)
printf("%s: is an md device, but kernel cannot provide details\n", dev);
Expand All @@ -91,7 +91,7 @@ int Query(char *dev)
if (st) {
superror = st->ss->load_super(st, fd, &super, dev);
superrno = errno;
} else
} else
superror = -1;
close(fd);
if (superror == 0) {
Expand All @@ -102,7 +102,7 @@ int Query(char *dev)
disc.number = info.disk.number;
activity = "undetected";
if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
if (md_get_version(fd) >= 9000 &&
if (md_get_version(fd) >= 9000 &&
ioctl(fd, GET_ARRAY_INFO, &array)>= 0) {
if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 &&
makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
Expand All @@ -117,7 +117,7 @@ int Query(char *dev)
mddev = "array";
}
printf("%s: device %d in %d device %s %s %s. Use mdadm --examine for more detail.\n",
dev,
dev,
info.disk.number, info.array.raid_disks,
activity,
map_num(pers, info.array.level),
Expand All @@ -128,4 +128,3 @@ int Query(char *dev)
return 0;
}


2 changes: 1 addition & 1 deletion ReadMe.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct option long_options[] = {

/* synonyms */
{"monitor", 0, 0, 'F'},

/* after those will normally come the name of the md device */
{"help", 0, 0, 'h'},
{"help-options",0,0,'h'},
Expand Down
6 changes: 3 additions & 3 deletions bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
skip = sizeof(info->sb);

sb_le_to_cpu(&info->sb); /* convert superblock to CPU byte ordering */

if (brief || info->sb.sync_size == 0)
goto out;

Expand Down Expand Up @@ -219,7 +219,7 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **st
if (!st) {
/* just look at device... */
lseek(fd, 0, 0);
} else {
} else {
st->ss->locate_bitmap(st, fd, NULL);
}
ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
Expand Down Expand Up @@ -398,7 +398,7 @@ int CreateBitmap(char *filename, int force, char uuid[16],
}
bytes -= sizeof(block);
}

rv = 0;
fflush(fp);
/* make the file be the right size (well, to the nearest byte) */
Expand Down
Loading

0 comments on commit aba6914

Please sign in to comment.