rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Uses q-parity instead qarity in messages.

Browse source
This commit is contained in:
Andrea Mazzoleni 2013-09-16 19:49:42 +02:00
parent 3b6dfd9ffe
commit 194846f01b
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
check.c
View file

@ -172,7 +172,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u
return 0;
}
fprintf(stdlog, "error:%u:qarity: Data error\n", pos);
fprintf(stdlog, "error:%u:q-parity: Data error\n", pos);
++error;
}
@ -191,7 +191,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u
return 0;
}
fprintf(stdlog, "error:%u:parity/qarity: Data error\n", pos);
fprintf(stdlog, "error:%u:parity/q-parity: Data error\n", pos);
++error;
}
@ -222,7 +222,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u
return 0;
}
fprintf(stdlog, "error:%u:parity/qarity: Data error\n", pos);
fprintf(stdlog, "error:%u:parity/q-parity: Data error\n", pos);
++error;
}
@ -766,7 +766,7 @@ static int state_check_process(struct snapraid_state* state, int check, int fix,
if (ret == -1) {
buffer_qarity = 0; /* no qarity to use */
fprintf(stdlog, "error:%u:qarity: Read error\n", i);
fprintf(stdlog, "error:%u:q-parity: Read error\n", i);
++error;
}
} else {
@ -828,7 +828,7 @@ static int state_check_process(struct snapraid_state* state, int check, int fix,
if (buffer_qarity != 0 && memcmp(buffer_qarity, buffer[diskmax + 1], state->block_size) != 0) {
buffer_qarity = 0;
fprintf(stdlog, "error:%u:qarity: Data error\n", i);
fprintf(stdlog, "error:%u:q-parity: Data error\n", i);
++error;
}
}
@ -907,7 +907,7 @@ static int state_check_process(struct snapraid_state* state, int check, int fix,
goto bail;
}
fprintf(stdlog, "fixed:%u:qarity: Fixed data error\n", i);
fprintf(stdlog, "fixed:%u:q-parity: Fixed data error\n", i);
++recovered_error;
}
}

2
dry.c
View file

@ -111,7 +111,7 @@ static int state_dry_process(struct snapraid_state* state, struct snapraid_parit
if (qarity) {
ret = parity_read(qarity, i, buffer_aligned, state->block_size, stdlog);
if (ret == -1) {
fprintf(stdlog, "error:%u:qarity: Read error\n", i);
fprintf(stdlog, "error:%u:q-parity: Read error\n", i);
++error;
}
}

4
scrub.c
View file

@ -307,7 +307,7 @@ static int state_scrub_process(struct snapraid_state* state, struct snapraid_par
ret = parity_read(qarity, i, buffer_qarity, state->block_size, stdlog);
if (ret == -1) {
buffer_qarity = 0;
fprintf(stdlog, "error:%u:qarity: Read error\n", i);
fprintf(stdlog, "error:%u:q-parity: Read error\n", i);
++error;
error_on_this_block = 1;
}
@ -331,7 +331,7 @@ static int state_scrub_process(struct snapraid_state* state, struct snapraid_par
}
if (state->level >= 2) {
if (buffer_qarity && memcmp(buffer[diskmax + 1], buffer_qarity, state->block_size) != 0) {
fprintf(stdlog, "error:%u:qarity: Data error\n", i);
fprintf(stdlog, "error:%u:q-parity: Data error\n", i);
++error;
/* it's a silent error only if we are dealing with synched blocks */

4
state.c
View file

@ -388,7 +388,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
else
pathcpy(device, sizeof(device), ".");
if (stat(device, &st) != 0) {
fprintf(stderr, "Error accessing 'qarity' dir '%s' specification in '%s' at line %u\n", device, path, line);
fprintf(stderr, "Error accessing 'q-parity' dir '%s' specification in '%s' at line %u\n", device, path, line);
exit(EXIT_FAILURE);
}
@ -657,7 +657,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
fprintf(stdlog, "mode:raid5\n");
fprintf(stdlog, "parity:%s\n", state->parity);
if (state->qarity[0] != 0)
fprintf(stdlog, "qarity:%s\n", state->qarity);
fprintf(stdlog, "q-parity:%s\n", state->qarity);
if (state->pool[0] != 0)
fprintf(stdlog, "pool:%s\n", state->pool);
fflush(stdlog);