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

liblvm: replace pvcreate_single with pvcreate_vol

Browse Source 
And remove the pvcreate_single wrapper.
This commit is contained in:
David Teigland 2016-01-26 11:50:11 -06:00
parent a9940bd3c9
commit 0cd7d2332c
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/metadata/metadata-exported.h
View File

@ -647,8 +647,6 @@ struct lvresize_params {
const char *ac_type;
};
int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
struct pvcreate_params *pp);
void pvcreate_params_set_defaults(struct pvcreate_params *pp);
/*

21
lib/metadata/pv_manip.c
View File

@ -864,24 +864,3 @@ out:
return ret;
}
int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
struct pvcreate_params *pp)
{
int r = 0;
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) {
log_error("Can't get lock for orphan PVs");
return 0;
}
if (!(pvcreate_vol(cmd, pv_name, pp, 1)))
goto_out;
r = 1;
out:
unlock_vg(cmd, VG_ORPHANS);
return r;
}

12
liblvm/lvm_pv.c
View File

@ -419,6 +419,7 @@ int lvm_pv_params_set_property(pv_create_params_t params, const char *name,
static int _pv_create(pv_create_params_t params)
{
struct cmd_context *cmd = (struct cmd_context *)params->libh;
int rc = 0;
if (params->pv_p.size) {
if (params->pv_p.size % SECTOR_SIZE) {
@ -428,9 +429,16 @@ static int _pv_create(pv_create_params_t params)
params->pv_p.size = params->pv_p.size >> SECTOR_SHIFT;
}
if (!pvcreate_single(cmd, params->pv_name, &params->pv_p))
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) {
log_errno(EINVAL, "Can't get lock for orphan PVs");
return -1;
return 0;
}
if (!(pvcreate_vol(cmd, params->pv_name, &params->pv_p, 1)))
rc = -1;
unlock_vg(cmd, VG_ORPHANS);
return rc;
}
int lvm_pv_create(lvm_t libh, const char *pv_name, uint64_t size)