diff options
| author | David Teigland <teigland@redhat.com> | 2016-01-26 11:50:11 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-02-17 13:25:04 -0600 |
| commit | e9f1ecaa2cf13e4ae6b759a7c5462f5e234414f1 (patch) | |
| tree | 96ca5935f52a0b1aebff6df901fcd83dd3f73a86 | |
| parent | 804314d9677682697436f39651760a01b8ac1bb0 (diff) | |
| download | lvm2-e9f1ecaa2cf13e4ae6b759a7c5462f5e234414f1.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 0a4539799..008aef254 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -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); /* diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index 423b6470d..1ae5f87c1 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -862,24 +862,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) |