Add one sanity check for missing device

[thirdparty/mdadm.git] / restripe.c

diff --git a/restripe.c b/restripe.c
index 359ae86ed5845d109336639629bc737f3895e39a..31b07e89f318191ec97c39bda899dedbd7d2fbf6 100644 (file)
--- a/restripe.c
+++ b/restripe.c
@@ -482,7 +482,7 @@ int raid6_check_disks(int data_disks, int start, int chunk_size,
                }
 
                if((Px == 0) && (Qx == 0))
-                       curr_broken_disk = curr_broken_disk;
+                       curr_broken_disk = prev_broken_disk;
 
                if(curr_broken_disk >= data_disks + 2)
                        broken_status = 2;
@@ -581,14 +581,16 @@ int save_stripes(int *source, unsigned long long *offsets,
                                       raid_disks, level, layout);
                        if (dnum < 0) abort();
                        if (source[dnum] < 0 ||
-                           lseek64(source[dnum], offsets[dnum]+offset, 0) < 0 ||
-                           read(source[dnum], buf+disk * chunk_size, chunk_size)
-                           != chunk_size)
+                           lseek64(source[dnum],
+                                   offsets[dnum] + offset, 0) < 0 ||
+                           read(source[dnum], buf+disk * chunk_size,
+                                chunk_size) != chunk_size) {
                                if (failed <= 2) {
                                        fdisk[failed] = dnum;
                                        fblock[failed] = disk;
                                        failed++;
                                }
+                       }
                }
                if (failed == 0 || fblock[0] >= data_disks)
                        /* all data disks are good */
@@ -731,8 +733,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
                zero_size = chunk_size;
        }
 
-       if (stripe_buf == NULL || stripes == NULL || blocks == NULL
-           || zero == NULL) {
+       if (stripe_buf == NULL || stripes == NULL || blocks == NULL ||
+           zero == NULL) {
                rv = -2;
                goto abort;
        }