imsm: pass subarray id to kill_subarray function
After patch b6180160f
("imsm: save current_vol number")
current_vol for imsm is not set and kill_subarray()
cannot determine which volume has to be deleted.
Volume has to be passed as "subarray_id".
The parameter affects only IMSM metadata.
Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
parent
fd38b8ea80
commit
3364781b92
2
Kill.c
2
Kill.c
|
@ -119,7 +119,7 @@ int Kill_subarray(char *dev, char *subarray, int verbose)
|
||||||
st->update_tail = &st->updates;
|
st->update_tail = &st->updates;
|
||||||
|
|
||||||
/* ok we've found our victim, drop the axe */
|
/* ok we've found our victim, drop the axe */
|
||||||
rv = st->ss->kill_subarray(st);
|
rv = st->ss->kill_subarray(st, subarray);
|
||||||
if (rv) {
|
if (rv) {
|
||||||
if (verbose >= 0)
|
if (verbose >= 0)
|
||||||
pr_err("Failed to delete subarray-%s from %s\n",
|
pr_err("Failed to delete subarray-%s from %s\n",
|
||||||
|
|
3
mdadm.h
3
mdadm.h
|
@ -1038,7 +1038,8 @@ extern struct superswitch {
|
||||||
/* query the supertype for default geometry */
|
/* query the supertype for default geometry */
|
||||||
void (*default_geometry)(struct supertype *st, int *level, int *layout, int *chunk); /* optional */
|
void (*default_geometry)(struct supertype *st, int *level, int *layout, int *chunk); /* optional */
|
||||||
/* Permit subarray's to be deleted from inactive containers */
|
/* Permit subarray's to be deleted from inactive containers */
|
||||||
int (*kill_subarray)(struct supertype *st); /* optional */
|
int (*kill_subarray)(struct supertype *st,
|
||||||
|
char *subarray_id); /* optional */
|
||||||
/* Permit subarray's to be modified */
|
/* Permit subarray's to be modified */
|
||||||
int (*update_subarray)(struct supertype *st, char *subarray,
|
int (*update_subarray)(struct supertype *st, char *subarray,
|
||||||
char *update, struct mddev_ident *ident); /* optional */
|
char *update, struct mddev_ident *ident); /* optional */
|
||||||
|
|
|
@ -4446,7 +4446,7 @@ static int _kill_subarray_ddf(struct ddf_super *ddf, const char *guid)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int kill_subarray_ddf(struct supertype *st)
|
static int kill_subarray_ddf(struct supertype *st, char *subarray_id)
|
||||||
{
|
{
|
||||||
struct ddf_super *ddf = st->sb;
|
struct ddf_super *ddf = st->sb;
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -7600,18 +7600,17 @@ static void default_geometry_imsm(struct supertype *st, int *level, int *layout,
|
||||||
|
|
||||||
static void handle_missing(struct intel_super *super, struct imsm_dev *dev);
|
static void handle_missing(struct intel_super *super, struct imsm_dev *dev);
|
||||||
|
|
||||||
static int kill_subarray_imsm(struct supertype *st)
|
static int kill_subarray_imsm(struct supertype *st, char *subarray_id)
|
||||||
{
|
{
|
||||||
/* remove the subarray currently referenced by ->current_vol */
|
/* remove the subarray currently referenced by subarray_id */
|
||||||
__u8 i;
|
__u8 i;
|
||||||
struct intel_dev **dp;
|
struct intel_dev **dp;
|
||||||
struct intel_super *super = st->sb;
|
struct intel_super *super = st->sb;
|
||||||
__u8 current_vol = super->current_vol;
|
__u8 current_vol = strtoul(subarray_id, NULL, 10);
|
||||||
struct imsm_super *mpb = super->anchor;
|
struct imsm_super *mpb = super->anchor;
|
||||||
|
|
||||||
if (super->current_vol < 0)
|
if (mpb->num_raid_devs == 0)
|
||||||
return 2;
|
return 2;
|
||||||
super->current_vol = -1; /* invalidate subarray cursor */
|
|
||||||
|
|
||||||
/* block deletions that would change the uuid of active subarrays
|
/* block deletions that would change the uuid of active subarrays
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue