diff options
author | David Teigland <teigland@redhat.com> | 2016-01-26 11:50:11 -0600 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2016-01-28 13:47:49 -0600 |
commit | 048e5e6ffa2c7e77a0bba3b9d776ed4f0e043ab9 (patch) | |
tree | 46695b70336e22d5f115b32d6047f81913f6f7e4 | |
parent | c685bd69dec6e848c9c7936b372a934eab162d38 (diff) | |
download | lvm2-048e5e6ffa2c7e77a0bba3b9d776ed4f0e043ab9.tar.gz |
liblvm: replace pvcreate_single with pvcreate_vol
And remove the pvcreate_single wrapper.
-rw-r--r-- | lib/metadata/metadata-exported.h | 2 | ||||
-rw-r--r-- | lib/metadata/pv_manip.c | 21 | ||||
-rw-r--r-- | liblvm/lvm_pv.c | 12 |
3 files changed, 10 insertions, 25 deletions
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index a211464fa..b2314edb8 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -643,8 +643,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); /* diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index 71260481b..0dd0c9773 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -851,24 +851,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; -} diff --git a/liblvm/lvm_pv.c b/liblvm/lvm_pv.c index 9b979f3cb..9bc7153ac 100644 --- a/liblvm/lvm_pv.c +++ b/liblvm/lvm_pv.c @@ -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, ¶ms->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, ¶ms->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) |