Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: Bad block verification during assembling array 

We need to refuse to assemble an arrays with bad blocks.
Initially there was condition in container_content function
that returns error value in the case when metadata store information
about bad blocks.
When the container_content function is called from functions NOT connected
with assemble (Kill_subarray, Detail) we get faulty error return value.
Patch introduces new flag in array.status - MD_SB_BBM_ERRORS. It is set
in container_content when bad blocks are detected and can be checked by
container_content caller.

Signed-off-by: Krzysztof Wojcik <krzysztof.wojcik@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Krzysztof Wojcik 2010-12-16 14:34:54 +01:00 committed by NeilBrown
parent e537630981
commit a06d022db4
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assemble.c
View File

@ -435,6 +435,13 @@ int Assemble(struct supertype *st, char *mddev,
content;
content = content->next) {
/* do not assemble arrays that might have bad blocks */
if (content->array.state & (1<<MD_SB_BBM_ERRORS)) {
fprintf(stderr, Name ": BBM log found in metadata. "
"Cannot activate array(s).\n");
tmpdev->used = 2;
goto loop;
}
if (!ident_matches(ident, content, tst,
homehost, update,
report_missmatch ? devname : NULL))

6
Incremental.c
View File

@ -1411,6 +1411,12 @@ static int Incremental_container(struct supertype *st, char *devname,
if (map_lock(&map))
fprintf(stderr, Name ": failed to get exclusive lock on "
"mapfile\n");
/* do not assemble arrays that might have bad blocks */
if (list->array.state & (1<<MD_SB_BBM_ERRORS)) {
fprintf(stderr, Name ": BBM log found in metadata. "
"Cannot activate array(s).\n");
list = NULL;
}
for (ra = list ; ra ; ra = ra->next) {
int mdfd;

1
md_p.h
View File

@ -100,6 +100,7 @@ typedef struct mdp_device_descriptor_s {
*/
#define MD_SB_CLEAN 0
#define MD_SB_ERRORS 1
#define MD_SB_BBM_ERRORS 2
#define MD_SB_BITMAP_PRESENT 8 /* bitmap may be present nearby */

14
super-intel.c
View File

@ -4520,13 +4520,11 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
struct imsm_super *mpb = super->anchor;
struct mdinfo *rest = NULL;
unsigned int i;
int bbm_errors = 0;
/* do not assemble arrays that might have bad blocks */
if (imsm_bbm_log_size(super->anchor)) {
fprintf(stderr, Name ": BBM log found in metadata. "
"Cannot activate array(s).\n");
return NULL;
}
/* check for bad blocks */
if (imsm_bbm_log_size(super->anchor))
bbm_errors = 1;
for (i = 0; i < mpb->num_raid_devs; i++) {
struct imsm_dev *dev;
@ -4635,6 +4633,10 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
rest = this;
}
/* if array has bad blocks, set suitable bit in array status */
if (bbm_errors)
rest->array.state |= (1<<MD_SB_BBM_ERRORS);
return rest;
}