33 lines
916 B
Diff
33 lines
916 B
Diff
|
--- multipath-tools.old/kpartx/kpartx.c 2008-07-23 22:49:52.000000000 +0200
|
||
|
+++ multipath-tools/kpartx/kpartx.c 2009-03-06 13:32:49.000000000 +0100
|
||
|
@@ -474,6 +474,7 @@ main(int argc, char **argv){
|
||
|
d = c;
|
||
|
while (c) {
|
||
|
for (j = 0; j < n; j++) {
|
||
|
+ uint64_t start;
|
||
|
int k = slices[j].container - 1;
|
||
|
|
||
|
if (slices[j].size == 0)
|
||
|
@@ -484,7 +485,7 @@ main(int argc, char **argv){
|
||
|
continue;
|
||
|
|
||
|
/* Skip all simple slices */
|
||
|
- if (k < 0)
|
||
|
+ if (slices[j].container == 0)
|
||
|
continue;
|
||
|
|
||
|
/* Check container slice */
|
||
|
@@ -499,10 +500,11 @@ main(int argc, char **argv){
|
||
|
}
|
||
|
strip_slash(partname);
|
||
|
|
||
|
+ start = slices[j].start - slices[k].start;
|
||
|
if (safe_sprintf(params, "%d:%d %" PRIu64,
|
||
|
slices[k].major,
|
||
|
slices[k].minor,
|
||
|
- slices[j].start)) {
|
||
|
+ start)) {
|
||
|
fprintf(stderr, "params too small\n");
|
||
|
exit(1);
|
||
|
}
|