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

mdmon: allow prepare_update to report failure. 

If 'prepare_update' fails for some reason there is little
point continuing on to 'process_update'.
For now only malloc failures are caught, but other failures
will be considered in future.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2014-07-10 15:54:02 +10:00
parent 0c21b485e4
commit 5fe6f031d9
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
managemon.c
View File

@ -819,7 +819,8 @@ static void handle_message(struct supertype *container, struct metadata_update *
mu->space_list = NULL;
mu->next = NULL;
if (container->ss->prepare_update)
container->ss->prepare_update(container, mu);
if (!container->ss->prepare_update(container, mu))
free_updates(&mu);
queue_metadata_update(mu);
}
}

5
mdadm.h
View File

@ -929,7 +929,10 @@ extern struct superswitch {
void (*sync_metadata)(struct supertype *st);
void (*process_update)(struct supertype *st,
struct metadata_update *update);
void (*prepare_update)(struct supertype *st,
/* Prepare updates allocates extra memory that might be
* needed. If the update cannot be understood, return 0.
*/
int (*prepare_update)(struct supertype *st,
struct metadata_update *update);
/* activate_spare will check if the array is degraded and, if it

8
super-ddf.c
View File

@ -4906,8 +4906,8 @@ static void ddf_process_update(struct supertype *st,
/* case DDF_SPARE_ASSIGN_MAGIC */
}
static void ddf_prepare_update(struct supertype *st,
struct metadata_update *update)
static int ddf_prepare_update(struct supertype *st,
struct metadata_update *update)
{
/* This update arrived at managemon.
* We are about to pass it to monitor.
@ -4922,15 +4922,17 @@ static void ddf_prepare_update(struct supertype *st,
offsetof(struct vcl, conf)
+ ddf->conf_rec_len * 512) != 0) {
update->space = NULL;
return;
return 0;
}
vcl = update->space;
vcl->conf.sec_elmnt_count = conf->sec_elmnt_count;
if (alloc_other_bvds(ddf, vcl) != 0) {
free(update->space);
update->space = NULL;
return 0;
}
}
return 1;
}
/*

9
super-intel.c
View File

@ -8607,8 +8607,8 @@ static void imsm_process_update(struct supertype *st,
static struct mdinfo *get_spares_for_grow(struct supertype *st);
static void imsm_prepare_update(struct supertype *st,
struct metadata_update *update)
static int imsm_prepare_update(struct supertype *st,
struct metadata_update *update)
{
/**
* Allocate space to hold new disk entries, raid-device entries or a new
@ -8828,6 +8828,7 @@ static void imsm_prepare_update(struct supertype *st,
else
super->next_buf = NULL;
}
return 1;
}
/* must be called while manager is quiesced */
@ -9716,8 +9717,8 @@ static void imsm_update_metadata_locally(struct supertype *st,
mu.space = NULL;
mu.space_list = NULL;
mu.next = NULL;
imsm_prepare_update(st, &mu);
imsm_process_update(st, &mu);
if (imsm_prepare_update(st, &mu))
imsm_process_update(st, &mu);
while (mu.space_list) {
void **space = mu.space_list;