managemon: fix typo affecting incrmental assembly.

[thirdparty/mdadm.git] / raid6check.c

diff --git a/raid6check.c b/raid6check.c
index f5aeee449f54df2249195adf919f53a3c901ec6c..805d090abfa8136ba39b3781a3f100e3d75f12d7 100644 (file)
--- a/raid6check.c
+++ b/raid6check.c
@@ -27,6 +27,12 @@
 #include <signal.h>
 #include <sys/mman.h>
 
+enum repair {
+       NO_REPAIR = 0,
+       MANUAL_REPAIR,
+       AUTO_REPAIR
+};
+
 int geo_map(int block, unsigned long long stripe, int raid_disks,
            int level, int layout);
 void qsyndrome(uint8_t *p, uint8_t *q, uint8_t **sources, int disks, int size);
@@ -37,7 +43,6 @@ void raid6_2data_recov(int disks, size_t bytes, int faila, int failb,
                       uint8_t **ptrs);
 void xor_blocks(char *target, char **sources, int disks, int size);
 
-
 /* Collect per stripe consistency information */
 void raid6_collect(int chunk_size, uint8_t *p, uint8_t *q,
                   char *chunkP, char *chunkQ, int *results)
@@ -138,11 +143,10 @@ int unlock_all_stripes(struct mdinfo *info, sighandler_t *sig) {
        return rv * 256;
 }
 
-
 int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
                  int raid_disks, int chunk_size, int level, int layout,
                  unsigned long long start, unsigned long long length, char *name[],
-                 int repair, int failed_disk1, int failed_disk2)
+                 enum repair repair, int failed_disk1, int failed_disk2)
 {
        /* read the data and p and q blocks, and check we got them right */
        char *stripe_buf = xmalloc(raid_disks * chunk_size);
@@ -179,8 +183,21 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
                        goto exitCheck;
                }
                for (i = 0 ; i < raid_disks ; i++) {
-                       lseek64(source[i], offsets[i] + start * chunk_size, 0);
-                       read(source[i], stripes[i], chunk_size);
+                       off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size,
+                                                  SEEK_SET);
+                       if (seek_res < 0) {
+                               fprintf(stderr, "lseek to source %d failed\n", i);
+                               unlock_all_stripes(info, sig);
+                               err = -1;
+                               goto exitCheck;
+                       }
+                       int read_res = read(source[i], stripes[i], chunk_size);
+                       if (read_res < chunk_size) {
+                               fprintf(stderr, "Failed to read complete chunk disk %d, aborting\n", i);
+                               unlock_all_stripes(info, sig);
+                               err = -1;
+                               goto exitCheck;
+                       }
                }
                err = unlock_all_stripes(info, sig);
                if(err != 0)
@@ -220,7 +237,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
                if(disk == -65535) {
                        printf("Error detected at %llu: disk slot unknown\n", start);
                }
-               if(repair == 1) {
+               if(repair == MANUAL_REPAIR) {
                        printf("Repairing stripe %llu\n", start);
                        printf("Assuming slots %d (%s) and %d (%s) are incorrect\n",
                               failed_disk1, name[failed_disk1],
@@ -276,15 +293,39 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
                                goto exitCheck;
                        }
 
-                       lseek64(source[failed_disk1], offsets[failed_disk1] + start * chunk_size, 0);
-                       write(source[failed_disk1], stripes[failed_disk1], chunk_size);
-                       lseek64(source[failed_disk2], offsets[failed_disk2] + start * chunk_size, 0);
-                       write(source[failed_disk2], stripes[failed_disk2], chunk_size);
+                       int write_res1, write_res2;
+                       off64_t seek_res;
+
+                       seek_res = lseek64(source[failed_disk1],
+                                          offsets[failed_disk1] + start * chunk_size, SEEK_SET);
+                       if (seek_res < 0) {
+                               fprintf(stderr, "lseek failed for failed_disk1\n");
+                               unlock_all_stripes(info, sig);
+                               err = -1;
+                               goto exitCheck;
+                       }
+                       write_res1 = write(source[failed_disk1], stripes[failed_disk1], chunk_size);
+
+                       seek_res = lseek64(source[failed_disk2],
+                                          offsets[failed_disk2] + start * chunk_size, SEEK_SET);
+                       if (seek_res < 0) {
+                               fprintf(stderr, "lseek failed for failed_disk1\n");
+                               unlock_all_stripes(info, sig);
+                               err = -1;
+                               goto exitCheck;
+                       }
+                       write_res2 = write(source[failed_disk2], stripes[failed_disk2], chunk_size);
 
                        err = unlock_all_stripes(info, sig);
                        if(err != 0)
                                goto exitCheck;
-               } else if (disk >= 0 && repair == 2) {
+
+                       if (write_res1 != chunk_size || write_res2 != chunk_size) {
+                               fprintf(stderr, "Failed to write a complete chunk.\n");
+                               goto exitCheck;
+                       }
+
+               } else if (disk >= 0 && repair == AUTO_REPAIR) {
                        printf("Auto-repairing slot %d (%s)\n", disk, name[disk]);
                        if (disk == diskQ) {
                                qsyndrome(p, (uint8_t*)stripes[diskQ], (uint8_t**)blocks, data_disks, chunk_size);
@@ -308,13 +349,17 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
                        }
 
                        lseek64(source[disk], offsets[disk] + start * chunk_size, 0);
-                       write(source[disk], stripes[disk], chunk_size);
+                       int write_res = write(source[disk], stripes[disk], chunk_size);
 
                        err = unlock_all_stripes(info, sig);
-                       if(err != 0)
+                       if(err != 0 || write_res != chunk_size)
                                goto exitCheck;
-               }
 
+                       if (write_res != chunk_size) {
+                               fprintf(stderr, "Failed to write a full chunk.\n");
+                               goto exitCheck;
+                       }
+               }
 
                length--;
                start++;
@@ -325,9 +370,11 @@ exitCheck:
        free(stripe_buf);
        free(stripes);
        free(blocks);
+       free(block_index_for_slot);
        free(p);
        free(q);
        free(results);
+       free(sig);
 
        return err;
 }
@@ -355,8 +402,9 @@ int main(int argc, char *argv[])
        int chunk_size = 0;
        int layout = -1;
        int level = 6;
-       int repair = 0;
-       int failed_disk1, failed_disk2;
+       enum repair repair = NO_REPAIR;
+       int failed_disk1 = -1;
+       int failed_disk2 = -1;
        unsigned long long start, length;
        int i;
        int mdfd;
@@ -445,7 +493,7 @@ int main(int argc, char *argv[])
                        exit_err = 1;
                        goto exitHere;
                }
-               repair = 1;
+               repair = MANUAL_REPAIR;
                start = getnum(argv[3], &err);
                length = 1;
                failed_disk1 = getnum(argv[4], &err);
@@ -471,7 +519,7 @@ int main(int argc, char *argv[])
                start = getnum(argv[2], &err);
                length = getnum(argv[3], &err);
                if (argc >= 5 && strcmp(argv[4], "autorepair")==0)
-                       repair = 2;
+                       repair = AUTO_REPAIR;
        }
 
        if (err) {