diff options
| author | Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> | 2013-06-18 11:09:36 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-06-19 10:04:43 +1000 |
| commit | 2c7b668df75ce355398a22e42b7a9ee860c10dbe (patch) | |
| tree | 75d6cc53901aba069942be3a2111b0570c43f325 /raid6check.c | |
| parent | 635b5861c3ef0fe945f1c3d8bed3760d1d7ab70c (diff) | |
raid6check: Fix compiler warnings.
Fix some compiler warnings appearing with optimization levels.
Signed-off-by: Bernd Schubert <bernd.schubert@fastmail.fm>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'raid6check.c')
| -rw-r--r-- | raid6check.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/raid6check.c b/raid6check.c index 480422d6..45d808d4 100644 --- a/raid6check.c +++ b/raid6check.c @@ -186,7 +186,12 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, } for (i = 0 ; i < raid_disks ; i++) { lseek64(source[i], offsets[i] + start * chunk_size, 0); - read(source[i], stripes[i], chunk_size); + 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); + goto exitCheck; + } } err = unlock_all_stripes(info, sig); if(err != 0) @@ -282,14 +287,23 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, goto exitCheck; } + int write_res1, write_res2; + lseek64(source[failed_disk1], offsets[failed_disk1] + start * chunk_size, 0); - write(source[failed_disk1], stripes[failed_disk1], chunk_size); + write_res1 = 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); + 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; + } + } else if (disk >= 0 && repair == AUTO_REPAIR) { printf("Auto-repairing slot %d (%s)\n", disk, name[disk]); if (disk == diskQ) { @@ -314,11 +328,16 @@ 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; + } } @@ -364,7 +383,8 @@ int main(int argc, char *argv[]) int layout = -1; int level = 6; enum repair repair = NO_REPAIR; - int failed_disk1, failed_disk2; + int failed_disk1 = -1; + int failed_disk2 = -1; unsigned long long start, length; int i; int mdfd; |