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

imsm: return correct uuid for volume in detail 

Fixes the side effect of the patch b6180160f ("imsm: save current_vol number")
- wrong UUID is printed in detail for each volume.
New parameter "subarray" is added to determine what info should be extracted
from metadata (subarray or container).
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:
Blazej Kucman 2019-11-29 15:21:08 +01:00 committed by Jes Sorensen
parent 4b31846f3f
commit b771faef93
6 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Detail.c
View File

@ -623,7 +623,7 @@ This is pretty boring
free_mdstat(ms);
if (st && st->sb)
st->ss->detail_super(st, c->homehost);
st->ss->detail_super(st, c->homehost, subarray);
if (array.raid_disks == 0 && sra &&
sra->array.major_version == -1 &&
@ -767,7 +767,7 @@ skip_devices_state:
if (spares && c->brief && array.raid_disks)
printf(" spares=%d", spares);
if (c->brief && st && st->sb)
st->ss->brief_detail_super(st);
st->ss->brief_detail_super(st, subarray);
if (st)
st->ss->free_super(st);

5
mdadm.h
View File

@ -847,8 +847,9 @@ extern struct superswitch {
/* Used to report details of an active array.
* ->load_super was possibly given a 'component' string.
*/
void (*detail_super)(struct supertype *st, char *homehost);
void (*brief_detail_super)(struct supertype *st);
void (*detail_super)(struct supertype *st, char *homehost,
char *subarray);
void (*brief_detail_super)(struct supertype *st, char *subarray);
void (*export_detail_super)(struct supertype *st);
/* Optional: platform hardware / firmware details */

5
super-ddf.c
View File

@ -1730,7 +1730,8 @@ err:
return 1;
}
static void detail_super_ddf(struct supertype *st, char *homehost)
static void detail_super_ddf(struct supertype *st, char *homehost,
char *subarray)
{
struct ddf_super *sb = st->sb;
int cnt = be16_to_cpu(sb->virt->populated_vdes);
@ -1787,7 +1788,7 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf,
memcpy(uuid, sha, 4*4);
}
static void brief_detail_super_ddf(struct supertype *st)
static void brief_detail_super_ddf(struct supertype *st, char *subarray)
{
struct mdinfo info;
char nbuf[64];

20
super-intel.c
View File

@ -2183,23 +2183,39 @@ err:
return 1;
}
static void detail_super_imsm(struct supertype *st, char *homehost)
static void detail_super_imsm(struct supertype *st, char *homehost,
char *subarray)
{
struct mdinfo info;
char nbuf[64];
struct intel_super *super = st->sb;
int temp_vol = super->current_vol;
if (subarray)
super->current_vol = strtoul(subarray, NULL, 10);
getinfo_super_imsm(st, &info, NULL);
fname_from_uuid(st, &info, nbuf, ':');
printf("\n UUID : %s\n", nbuf + 5);
super->current_vol = temp_vol;
}
static void brief_detail_super_imsm(struct supertype *st)
static void brief_detail_super_imsm(struct supertype *st, char *subarray)
{
struct mdinfo info;
char nbuf[64];
struct intel_super *super = st->sb;
int temp_vol = super->current_vol;
if (subarray)
super->current_vol = strtoul(subarray, NULL, 10);
getinfo_super_imsm(st, &info, NULL);
fname_from_uuid(st, &info, nbuf, ':');
printf(" UUID=%s", nbuf + 5);
super->current_vol = temp_vol;
}
static int imsm_read_serial(int fd, char *devname, __u8 *serial);

4
super0.c
View File

@ -348,7 +348,7 @@ err:
return 1;
}
static void detail_super0(struct supertype *st, char *homehost)
static void detail_super0(struct supertype *st, char *homehost, char *subarray)
{
mdp_super_t *sb = st->sb;
printf(" UUID : ");
@ -368,7 +368,7 @@ static void detail_super0(struct supertype *st, char *homehost)
printf("\n Events : %d.%d\n\n", sb->events_hi, sb->events_lo);
}
static void brief_detail_super0(struct supertype *st)
static void brief_detail_super0(struct supertype *st, char *subarray)
{
mdp_super_t *sb = st->sb;
printf(" UUID=");

4
super1.c
View File

@ -833,7 +833,7 @@ err:
return 1;
}
static void detail_super1(struct supertype *st, char *homehost)
static void detail_super1(struct supertype *st, char *homehost, char *subarray)
{
struct mdp_superblock_1 *sb = st->sb;
bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + MAX_SB_SIZE);
@ -857,7 +857,7 @@ static void detail_super1(struct supertype *st, char *homehost)
(unsigned long long)__le64_to_cpu(sb->events));
}
static void brief_detail_super1(struct supertype *st)
static void brief_detail_super1(struct supertype *st, char *subarray)
{
struct mdp_superblock_1 *sb = st->sb;
int i;