shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-28 20:25:52 +03:00
Code Releases Activity

metadata: add_pv_to_vg: add 'new_pv' arg to state if the PV is about to be created

Browse Source
This commit is contained in:
Peter Rajnoha 2015-03-12 14:37:50 +01:00
parent 4cbaaa5c98
commit 2950adc2ab
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/metadata/metadata.c
View File

@ -177,7 +177,8 @@ void del_pvl_from_vgs(struct volume_group *vg, struct pv_list *pvl)
* FIXME: remove pv_name - obtain safely from pv * FIXME: remove pv_name - obtain safely from pv
*/ */
int add_pv_to_vg(struct volume_group *vg, const char *pv_name, int add_pv_to_vg(struct volume_group *vg, const char *pv_name,
struct physical_volume *pv, struct pvcreate_params *pp) struct physical_volume *pv, struct pvcreate_params *pp,
int new_pv)
{ {
struct pv_to_write *pvw; struct pv_to_write *pvw;
struct pv_list *pvl; struct pv_list *pvl;
@ -284,7 +285,7 @@ int add_pv_to_vg(struct volume_group *vg, const char *pv_name,
return 0; return 0;
} }
pvw->pv = pv; pvw->pv = pv;
pvw->pp = pp; pvw->pp = new_pv ? pp : NULL;
dm_list_add(&vg->pvs_to_write, &pvw->list); dm_list_add(&vg->pvs_to_write, &pvw->list);
} }
@ -710,6 +711,7 @@ static int vg_extend_single_pv(struct volume_group *vg, char *pv_name,
unsigned int *max_phys_block_size) unsigned int *max_phys_block_size)
{ {
struct physical_volume *pv; struct physical_volume *pv;
int new_pv = 0;
pv = find_pv_by_name(vg->cmd, pv_name, 1, 1); pv = find_pv_by_name(vg->cmd, pv_name, 1, 1);
@ -720,13 +722,14 @@ static int vg_extend_single_pv(struct volume_group *vg, char *pv_name,
} else if (!pv && pp) { } else if (!pv && pp) {
if (!(pv = pvcreate_vol(vg->cmd, pv_name, pp, 0))) if (!(pv = pvcreate_vol(vg->cmd, pv_name, pp, 0)))
return_0; return_0;
new_pv = 1;
} }
if (!(check_dev_block_size_for_vg(pv->dev, (const struct volume_group *) vg, if (!(check_dev_block_size_for_vg(pv->dev, (const struct volume_group *) vg,
max_phys_block_size))) max_phys_block_size)))
goto_bad; goto_bad;
if (!add_pv_to_vg(vg, pv_name, pv, pp)) if (!add_pv_to_vg(vg, pv_name, pv, pp, new_pv))
goto_bad; goto_bad;
return 1; return 1;
@ -1610,7 +1613,7 @@ void pvcreate_params_set_defaults(struct pvcreate_params *pp)
static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw)
{ {
int zero = pvw->pp->zero; int zero = pvw->pp ? pvw->pp->zero : 1;
struct physical_volume *pv = pvw->pv; struct physical_volume *pv = pvw->pv;
struct device *dev = pv->dev; struct device *dev = pv->dev;
const char *pv_name = dev_name(dev); const char *pv_name = dev_name(dev);

3
lib/metadata/metadata.h
View File

@ -496,7 +496,8 @@ const struct format_type *pv_format_type(const struct physical_volume *pv);
struct id pv_vgid(const struct physical_volume *pv); struct id pv_vgid(const struct physical_volume *pv);
int add_pv_to_vg(struct volume_group *vg, const char *pv_name, int add_pv_to_vg(struct volume_group *vg, const char *pv_name,
struct physical_volume *pv, struct pvcreate_params *pp); struct physical_volume *pv, struct pvcreate_params *pp,
int new_pv);
uint64_t find_min_mda_size(struct dm_list *mdas); uint64_t find_min_mda_size(struct dm_list *mdas);
char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tagsl); char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tagsl);