X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=raid6check.c;h=805d090abfa8136ba39b3781a3f100e3d75f12d7;hb=1011e8344a6b881883af57959cdd9ec7f9084407;hp=45d808d45305a71765c28bf34024325f08a2f888;hpb=2c7b668df75ce355398a22e42b7a9ee860c10dbe;p=thirdparty%2Fmdadm.git diff --git a/raid6check.c b/raid6check.c index 45d808d4..805d090a 100644 --- a/raid6check.c +++ b/raid6check.c @@ -43,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) @@ -144,7 +143,6 @@ 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[], @@ -185,11 +183,19 @@ 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); + 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; } } @@ -288,17 +294,32 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, } int write_res1, write_res2; + off64_t seek_res; - lseek64(source[failed_disk1], offsets[failed_disk1] + start * chunk_size, 0); + 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); - lseek64(source[failed_disk2], offsets[failed_disk2] + start * chunk_size, 0); + + 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; - if (write_res1 != chunk_size || write_res2 != chunk_size) { fprintf(stderr, "Failed to write a complete chunk.\n"); goto exitCheck; @@ -340,7 +361,6 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, } } - length--; start++; }