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

imsm: create mdinfo list of disks in a container from supertype 

If getinfo_super is called on a container supertype we only get information
on first disk. As a parameter it uses reference to preallocated
mdinfo structure. Amending getinfo_super to return full list of disks
would require ammending all previous calls and subsequently freeing memory
allocated for mdinfo list.
Function container_content that returns a mdinfo list is written
specifically for assembly, performing actions not needed to just fill
mdinfo. It also does not include spares so is unsuitable.
As an alternative a new function getinfo_super_disks is created
to obtain information about all disks states in array.
Existing function sysfs_free is used to free memory
allocated by getinfo_super_disks.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Anna Czarnowska 2010-11-22 20:58:07 +11:00 committed by NeilBrown
parent c3621c0a5f
commit 5c4cd5da70
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mdadm.h
View File

@ -548,7 +548,7 @@ extern struct superswitch {
* appear to be failed/missing.
*/
void (*getinfo_super)(struct supertype *st, struct mdinfo *info, char *map);
struct mdinfo *(*getinfo_super_disks)(struct supertype *st);
/* Check if the given metadata is flagged as belonging to "this"
* host. 0 for 'no', 1 for 'yes', -1 for "Don't record homehost"
*/

46
super-intel.c
View File

@ -1690,6 +1690,51 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *
}
/* allocates memory and fills disk in mdinfo structure
* for each disk in array */
struct mdinfo *getinfo_super_disks_imsm(struct supertype *st)
{
struct mdinfo *mddev = NULL;
struct intel_super *super = st->sb;
struct imsm_disk *disk;
int count = 0;
struct dl *dl;
if (!super || !super->disks)
return NULL;
dl = super->disks;
mddev = malloc(sizeof(*mddev));
if (!mddev) {
fprintf(stderr, Name ": Failed to allocate memory.\n");
return NULL;
}
memset(mddev, 0, sizeof(*mddev));
while (dl) {
struct mdinfo *tmp;
disk = &dl->disk;
tmp = malloc(sizeof(*tmp));
if (!tmp) {
fprintf(stderr, Name ": Failed to allocate memory.\n");
if (mddev)
sysfs_free(mddev);
return NULL;
}
memset(tmp, 0, sizeof(*tmp));
if (mddev->devs)
tmp->next = mddev->devs;
mddev->devs = tmp;
tmp->disk.number = count++;
tmp->disk.major = dl->major;
tmp->disk.minor = dl->minor;
tmp->disk.state = is_configured(disk) ?
(1 << MD_DISK_ACTIVE) : 0;
tmp->disk.state |= is_failed(disk) ? (1 << MD_DISK_FAULTY) : 0;
tmp->disk.state |= is_spare(disk) ? 0 : (1 << MD_DISK_SYNC);
tmp->disk.raid_disk = -1;
dl = dl->next;
}
return mddev;
}
static int update_super_imsm(struct supertype *st, struct mdinfo *info,
char *update, char *devname, int verbose,
int uuid_set, char *homehost)
@ -5579,6 +5624,7 @@ struct superswitch super_imsm = {
.match_home = match_home_imsm,
.uuid_from_super= uuid_from_super_imsm,
.getinfo_super = getinfo_super_imsm,
.getinfo_super_disks = getinfo_super_disks_imsm,
.update_super = update_super_imsm,
.avail_size = avail_size_imsm,