shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Add format instance support for pv_read code.

Browse Source
This commit is contained in:
Peter Rajnoha 2011-02-21 12:13:40 +00:00
parent 56280d0d3a
commit 6e0b348d34
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/metadata/metadata.c
View File

@ -37,6 +37,7 @@
static struct physical_volume *_pv_read(struct cmd_context *cmd, static struct physical_volume *_pv_read(struct cmd_context *cmd,
struct dm_pool *pvmem, struct dm_pool *pvmem,
const char *pv_name, const char *pv_name,
struct format_instance *fid,
struct dm_list *mdas, struct dm_list *mdas,
uint64_t *label_sector, uint64_t *label_sector,
int warnings, int scan_label_only); int warnings, int scan_label_only);
@ -166,6 +167,7 @@ void add_pvl_to_vgs(struct volume_group *vg, struct pv_list *pvl)
dm_list_add(&vg->pvs, &pvl->list); dm_list_add(&vg->pvs, &pvl->list);
vg->pv_count++; vg->pv_count++;
pvl->pv->vg = vg; pvl->pv->vg = vg;
pvl->pv->fid = vg->fid;
} }
void del_pvl_from_vgs(struct volume_group *vg, struct pv_list *pvl) void del_pvl_from_vgs(struct volume_group *vg, struct pv_list *pvl)
@ -1823,7 +1825,7 @@ static struct physical_volume *_find_pv_by_name(struct cmd_context *cmd,
struct physical_volume *pv; struct physical_volume *pv;
dm_list_init(&mdas); dm_list_init(&mdas);
if (!(pv = _pv_read(cmd, cmd->mem, pv_name, &mdas, NULL, 1, 0))) { if (!(pv = _pv_read(cmd, cmd->mem, pv_name, NULL, &mdas, NULL, 1, 0))) {
log_error("Physical volume %s not found", pv_name); log_error("Physical volume %s not found", pv_name);
return NULL; return NULL;
} }
@ -1832,7 +1834,7 @@ static struct physical_volume *_find_pv_by_name(struct cmd_context *cmd,
/* If a PV has no MDAs - need to search all VGs for it */ /* If a PV has no MDAs - need to search all VGs for it */
if (!scan_vgs_for_pvs(cmd, 1)) if (!scan_vgs_for_pvs(cmd, 1))
return_NULL; return_NULL;
if (!(pv = _pv_read(cmd, cmd->mem, pv_name, NULL, NULL, 1, 0))) { if (!(pv = _pv_read(cmd, cmd->mem, pv_name, NULL, NULL, NULL, 1, 0))) {
log_error("Physical volume %s not found", pv_name); log_error("Physical volume %s not found", pv_name);
return NULL; return NULL;
} }
@ -2657,7 +2659,8 @@ static struct volume_group *_vg_read_orphans(struct cmd_context *cmd,
} }
dm_list_iterate_items(info, &vginfo->infos) { dm_list_iterate_items(info, &vginfo->infos) {
if (!(pv = _pv_read(cmd, mem, dev_name(info->dev), NULL, NULL, warnings, 0))) { if (!(pv = _pv_read(cmd, mem, dev_name(info->dev), vg->fid,
NULL, NULL, warnings, 0))) {
continue; continue;
} }
if (!(pvl = dm_pool_zalloc(mem, sizeof(*pvl)))) { if (!(pvl = dm_pool_zalloc(mem, sizeof(*pvl)))) {
@ -3377,18 +3380,20 @@ struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name,
struct dm_list *mdas, uint64_t *label_sector, struct dm_list *mdas, uint64_t *label_sector,
int warnings, int scan_label_only) int warnings, int scan_label_only)
{ {
return _pv_read(cmd, cmd->mem, pv_name, mdas, label_sector, warnings, scan_label_only); return _pv_read(cmd, cmd->mem, pv_name, NULL, mdas, label_sector, warnings, scan_label_only);
} }
/* FIXME Use label functions instead of PV functions */ /* FIXME Use label functions instead of PV functions */
static struct physical_volume *_pv_read(struct cmd_context *cmd, static struct physical_volume *_pv_read(struct cmd_context *cmd,
struct dm_pool *pvmem, struct dm_pool *pvmem,
const char *pv_name, const char *pv_name,
struct format_instance *fid,
struct dm_list *mdas, struct dm_list *mdas,
uint64_t *label_sector, uint64_t *label_sector,
int warnings, int scan_label_only) int warnings, int scan_label_only)
{ {
struct physical_volume *pv; struct physical_volume *pv;
struct format_instance_ctx fic;
struct label *label; struct label *label;
struct lvmcache_info *info; struct lvmcache_info *info;
struct device *dev; struct device *dev;
@ -3427,6 +3432,18 @@ static struct physical_volume *_pv_read(struct cmd_context *cmd,
if (!alloc_pv_segment_whole_pv(pvmem, pv)) if (!alloc_pv_segment_whole_pv(pvmem, pv))
goto_bad; goto_bad;
if (fid)
fid_add_mdas(fid, &info->mdas, (const char *) &pv->id, ID_LEN);
else {
fic.type = FMT_INSTANCE_PV | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
fic.context.pv_id = (const char *) &pv->id;
if (!(pv->fid = pv->fmt->ops->create_instance(pv->fmt, &fic))) {
log_error("_pv_read: Couldn't create format instance "
"for PV %s", pv_name);
goto bad;
}
}
return pv; return pv;
bad: bad:
_free_pv(pvmem, pv); _free_pv(pvmem, pv);
@ -4244,5 +4261,5 @@ struct physical_volume *pv_by_path(struct cmd_context *cmd, const char *pv_name)
struct dm_list mdas; struct dm_list mdas;
dm_list_init(&mdas); dm_list_init(&mdas);
return _pv_read(cmd, cmd->mem, pv_name, &mdas, NULL, 1, 0); return _pv_read(cmd, cmd->mem, pv_name, NULL, &mdas, NULL, 1, 0);
} }