reindent/reformat some code.
Indenting was all wrong here, so fix it up. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
10af14c4d2
commit
e7a71c6b77
66
Grow.c
66
Grow.c
|
@ -3020,44 +3020,50 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt
|
||||||
if (bsb.magic[15] == '1') {
|
if (bsb.magic[15] == '1') {
|
||||||
if (bsb.length == 0)
|
if (bsb.length == 0)
|
||||||
continue;
|
continue;
|
||||||
if (info->delta_disks >= 0) {
|
if (info->delta_disks >= 0) {
|
||||||
/* reshape_progress is increasing */
|
/* reshape_progress is increasing */
|
||||||
if (__le64_to_cpu(bsb.arraystart) + __le64_to_cpu(bsb.length) <
|
if (__le64_to_cpu(bsb.arraystart)
|
||||||
info->reshape_progress) {
|
+ __le64_to_cpu(bsb.length)
|
||||||
nonew:
|
< info->reshape_progress) {
|
||||||
if (verbose)
|
nonew:
|
||||||
fprintf(stderr, Name ": backup-metadata found on %s but is not needed\n", devname);
|
if (verbose)
|
||||||
continue; /* No new data here */
|
fprintf(stderr, Name
|
||||||
|
": backup-metadata found on %s but is not needed\n", devname);
|
||||||
|
continue; /* No new data here */
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* reshape_progress is decreasing */
|
||||||
|
if (__le64_to_cpu(bsb.arraystart) >=
|
||||||
|
info->reshape_progress)
|
||||||
|
goto nonew; /* No new data here */
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
/* reshape_progress is decreasing */
|
|
||||||
if (__le64_to_cpu(bsb.arraystart) >=
|
|
||||||
info->reshape_progress)
|
|
||||||
goto nonew; /* No new data here */
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (bsb.length == 0 && bsb.length2 == 0)
|
if (bsb.length == 0 && bsb.length2 == 0)
|
||||||
continue;
|
continue;
|
||||||
if (info->delta_disks >= 0) {
|
if (info->delta_disks >= 0) {
|
||||||
/* reshape_progress is increasing */
|
/* reshape_progress is increasing */
|
||||||
if (__le64_to_cpu(bsb.arraystart) + __le64_to_cpu(bsb.length) <
|
if ((__le64_to_cpu(bsb.arraystart)
|
||||||
info->reshape_progress &&
|
+ __le64_to_cpu(bsb.length)
|
||||||
__le64_to_cpu(bsb.arraystart2) + __le64_to_cpu(bsb.length2) <
|
< info->reshape_progress)
|
||||||
info->reshape_progress)
|
&&
|
||||||
goto nonew; /* No new data here */
|
(__le64_to_cpu(bsb.arraystart2)
|
||||||
} else {
|
+ __le64_to_cpu(bsb.length2)
|
||||||
/* reshape_progress is decreasing */
|
< info->reshape_progress))
|
||||||
if (__le64_to_cpu(bsb.arraystart) >=
|
goto nonew; /* No new data here */
|
||||||
info->reshape_progress &&
|
} else {
|
||||||
__le64_to_cpu(bsb.arraystart2) >=
|
/* reshape_progress is decreasing */
|
||||||
info->reshape_progress)
|
if (__le64_to_cpu(bsb.arraystart) >=
|
||||||
goto nonew; /* No new data here */
|
info->reshape_progress &&
|
||||||
}
|
__le64_to_cpu(bsb.arraystart2) >=
|
||||||
|
info->reshape_progress)
|
||||||
|
goto nonew; /* No new data here */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (lseek64(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
|
if (lseek64(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
|
||||||
second_fail:
|
second_fail:
|
||||||
if (verbose)
|
if (verbose)
|
||||||
fprintf(stderr, Name ": Failed to verify secondary backup-metadata block on %s\n",
|
fprintf(stderr, Name
|
||||||
|
": Failed to verify secondary backup-metadata block on %s\n",
|
||||||
devname);
|
devname);
|
||||||
continue; /* Cannot seek */
|
continue; /* Cannot seek */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue