From b7dd5ac374156821a58013adde462e9e12527de8 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Wed, 13 Jun 2007 23:29:33 +0000 Subject: Convert pv->dev to get_pv_dev --- tools/pvchange.c | 2 +- tools/pvdisplay.c | 2 +- tools/pvmove.c | 4 ++-- tools/pvresize.c | 4 ++-- tools/pvscan.c | 8 ++++---- tools/vgconvert.c | 12 ++++++------ tools/vgreduce.c | 8 ++++---- tools/vgremove.c | 8 ++++---- tools/vgsplit.c | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/pvchange.c b/tools/pvchange.c index 3c26688a..06d514c9 100644 --- a/tools/pvchange.c +++ b/tools/pvchange.c @@ -26,7 +26,7 @@ static int _pvchange_single(struct cmd_context *cmd, struct physical_volume *pv, uint64_t sector; uint32_t orig_pe_alloc_count; - const char *pv_name = dev_name(pv->dev); + const char *pv_name = dev_name(get_pv_dev(pv)); const char *tag = NULL; const char *orig_vg_name; char uuid[64] __attribute((aligned(8))); diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c index e16836d6..8799406f 100644 --- a/tools/pvdisplay.c +++ b/tools/pvdisplay.c @@ -24,7 +24,7 @@ static int _pvdisplay_single(struct cmd_context *cmd, int ret = ECMD_PROCESSED; uint64_t size; - const char *pv_name = dev_name(pv->dev); + const char *pv_name = dev_name(get_pv_dev(pv)); if (pv->vg_name) { if (!lock_vol(cmd, pv->vg_name, LCK_VG_READ)) { diff --git a/tools/pvmove.c b/tools/pvmove.c index 841d89ab..f253945b 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -100,7 +100,7 @@ static struct list *_get_allocatable_pvs(struct cmd_context *cmd, int argc, pvl = list_item(pvh, struct pv_list); /* Don't allocate onto the PV we're clearing! */ - if ((alloc != ALLOC_ANYWHERE) && (pvl->pv->dev == pv->dev)) { + if ((alloc != ALLOC_ANYWHERE) && (pvl->pv->dev == get_pv_dev(pv))) { list_del(&pvl->list); continue; } @@ -296,7 +296,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, return ECMD_FAILED; } - if ((lv_mirr = find_pvmove_lv(vg, pv->dev, PVMOVE))) { + if ((lv_mirr = find_pvmove_lv(vg, get_pv_dev(pv), PVMOVE))) { log_print("Detected pvmove in progress for %s", pv_name); if (argc || lv_name) log_error("Ignoring remaining command line arguments"); diff --git a/tools/pvresize.c b/tools/pvresize.c index 961769c9..b2164772 100644 --- a/tools/pvresize.c +++ b/tools/pvresize.c @@ -33,7 +33,7 @@ static int _pvresize_single(struct cmd_context *cmd, uint64_t size = 0; uint32_t new_pe_count = 0; struct list mdas; - const char *pv_name = dev_name(pv->dev); + const char *pv_name = dev_name(get_pv_dev(pv)); struct pvresize_params *params = (struct pvresize_params *) handle; const char *vg_name; @@ -103,7 +103,7 @@ static int _pvresize_single(struct cmd_context *cmd, } /* Get new size */ - if (!dev_get_size(pv->dev, &size)) { + if (!dev_get_size(get_pv_dev(pv), &size)) { log_error("%s: Couldn't get size.", pv_name); unlock_vg(cmd, vg_name); return ECMD_FAILED; diff --git a/tools/pvscan.c b/tools/pvscan.c index 242aff35..85db06ac 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -31,7 +31,7 @@ static void _pvscan_display_single(struct cmd_context *cmd, /* short listing? */ if (arg_count(cmd, short_ARG) > 0) { - log_print("%s", dev_name(pv->dev)); + log_print("%s", dev_name(get_pv_dev(pv))); return; } @@ -57,9 +57,9 @@ static void _pvscan_display_single(struct cmd_context *cmd, } sprintf(pv_tmp_name, "%-*s with UUID %s", - pv_max_name_len - 2, dev_name(pv->dev), uuid); + pv_max_name_len - 2, dev_name(get_pv_dev(pv)), uuid); } else { - sprintf(pv_tmp_name, "%s", dev_name(pv->dev)); + sprintf(pv_tmp_name, "%s", dev_name(get_pv_dev(pv))); } if (!*pv->vg_name) { @@ -166,7 +166,7 @@ int pvscan(struct cmd_context *cmd, int argc __attribute((unused)), pv_max_name_len = vg_max_name_len = 0; list_iterate_items(pvl, pvslist) { pv = pvl->pv; - len = strlen(dev_name(pv->dev)); + len = strlen(dev_name(get_pv_dev(pv))); if (pv_max_name_len < len) pv_max_name_len = len; len = strlen(pv->vg_name); diff --git a/tools/vgconvert.c b/tools/vgconvert.c index 6b61c9ae..5c0b6cad 100644 --- a/tools/vgconvert.c +++ b/tools/vgconvert.c @@ -136,30 +136,30 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name, change_made = 1; log_verbose("Set up physical volume for \"%s\" with %" PRIu64 - " available sectors", dev_name(pv->dev), get_pv_size(pv)); + " available sectors", dev_name(get_pv_dev(pv)), get_pv_size(pv)); /* Wipe existing label first */ - if (!label_remove(pv->dev)) { + if (!label_remove(get_pv_dev(pv))) { log_error("Failed to wipe existing label on %s", - dev_name(pv->dev)); + dev_name(get_pv_dev(pv))); log_error("Use pvcreate and vgcfgrestore to repair " "from archived metadata."); return ECMD_FAILED; } log_very_verbose("Writing physical volume data to disk \"%s\"", - dev_name(pv->dev)); + dev_name(get_pv_dev(pv))); if (!(pv_write(cmd, pv, &mdas, arg_int64_value(cmd, labelsector_ARG, DEFAULT_LABELSECTOR)))) { log_error("Failed to write physical volume \"%s\"", - dev_name(pv->dev)); + dev_name(get_pv_dev(pv))); log_error("Use pvcreate and vgcfgrestore to repair " "from archived metadata."); return ECMD_FAILED; } log_verbose("Physical volume \"%s\" successfully created", - dev_name(pv->dev)); + dev_name(get_pv_dev(pv))); } diff --git a/tools/vgreduce.c b/tools/vgreduce.c index bab443a1..8abed4b6 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -185,7 +185,7 @@ static int _make_vg_consistent(struct cmd_context *cmd, struct volume_group *vg) /* FIXME Also check for segs on deleted LVs */ pv = seg_pv(seg, s); - if (!pv || !pv->dev) { + if (!pv || !get_pv_dev(pv)) { if (arg_count(cmd, mirrorsonly_ARG) && !(lv->status & MIRROR_IMAGE)) { log_error("Non-mirror-image LV %s found: can't remove.", lv->name); @@ -365,7 +365,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, void *handle __attribute((unused))) { struct pv_list *pvl; - const char *name = dev_name(pv->dev); + const char *name = dev_name(get_pv_dev(pv)); if (get_pv_pe_alloc_count(pv)) { log_error("Physical volume \"%s\" still in use", name); @@ -391,8 +391,8 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, pv->vg_name = ORPHAN; pv->status = ALLOCATABLE_PV; - if (!dev_get_size(pv->dev, &pv->size)) { - log_error("%s: Couldn't get size.", dev_name(pv->dev)); + if (!dev_get_size(get_pv_dev(pv), &pv->size)) { + log_error("%s: Couldn't get size.", dev_name(get_pv_dev(pv))); return ECMD_FAILED; } diff --git a/tools/vgremove.c b/tools/vgremove.c index 9aca5207..efa1c93f 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -54,12 +54,12 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name, list_iterate_items(pvl, &vg->pvs) { pv = pvl->pv; log_verbose("Removing physical volume \"%s\" from " - "volume group \"%s\"", dev_name(pv->dev), vg_name); + "volume group \"%s\"", dev_name(get_pv_dev(pv)), vg_name); pv->vg_name = ORPHAN; pv->status = ALLOCATABLE_PV; - if (!dev_get_size(pv->dev, &pv->size)) { - log_error("%s: Couldn't get size.", dev_name(pv->dev)); + if (!dev_get_size(get_pv_dev(pv), &pv->size)) { + log_error("%s: Couldn't get size.", dev_name(get_pv_dev(pv))); ret = ECMD_FAILED; continue; } @@ -68,7 +68,7 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name, if (!pv_write(cmd, pv, NULL, INT64_C(-1))) { log_error("Failed to remove physical volume \"%s\"" " from volume group \"%s\"", - dev_name(pv->dev), vg_name); + dev_name(get_pv_dev(pv)), vg_name); ret = ECMD_FAILED; } } diff --git a/tools/vgsplit.c b/tools/vgsplit.c index dc1e8aee..e5618b71 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -105,7 +105,7 @@ static int _move_lvs(struct volume_group *vg_from, struct volume_group *vg_to) continue; } log_error("Physical Volume %s not found", - dev_name(pv->dev)); + dev_name(get_pv_dev(pv))); return 0; } -- cgit