From 33e56019378f72fe7d0561032b21597ab7c097a0 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Thu, 12 Jul 2007 15:38:53 +0000 Subject: [PATCH] Change pv_read_path to pv_by_path --- WHATS_NEW | 2 +- lib/metadata/metadata.c | 7 ++++--- lib/metadata/metadata.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e51820e40..8cc708edc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,7 +1,7 @@ Version 2.02.27 - ================================ Turn _add_pv_to_vg() into external library function add_pv_to_vg(). - Add pv_read_path() external library function. + Add pv_by_path() external library function. Tidy clvmd-openais of redundant bits, and improve an error report. Cope with find_seg_by_le() failure in check_lv_segments(). Call dev_iter_destroy() if _process_all_devs() is interrupted by sigint. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index ff8968de2..7f0764915 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -255,7 +255,7 @@ int vg_extend(struct volume_group *vg, int pv_count, char **pv_names) /* attach each pv */ for (i = 0; i < pv_count; i++) { - if (!(pv = pv_read_path(vg->fid->fmt->cmd, pv_names[i]))) { + if (!(pv = pv_by_path(vg->fid->fmt->cmd, pv_names[i]))) { log_error("%s not identified as an existing " "physical volume", pv_names[i]); goto bad; @@ -1858,7 +1858,7 @@ uint32_t vg_status(vg_t *vg) /** - * pv_read_path - Given a device path return a PV handle if it is a PV + * pv_by_path - Given a device path return a PV handle if it is a PV * @cmd - handle to the LVM command instance * @pv_name - device path to read for the PV * @@ -1866,8 +1866,9 @@ uint32_t vg_status(vg_t *vg) * NULL - device path does not contain a valid PV * non-NULL - PV handle corresponding to device path * + * FIXME: merge with find_pv_by_name ? */ -pv_t *pv_read_path(struct cmd_context *cmd, const char *pv_name) +pv_t *pv_by_path(struct cmd_context *cmd, const char *pv_name) { struct list mdas; diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 202d9fdba..9d1972f92 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -654,7 +654,7 @@ uint32_t pv_pe_alloc_count(pv_t *pv); uint32_t vg_status(vg_t *vg); -pv_t *pv_read_path(struct cmd_context *cmd, const char *pv_name); +pv_t *pv_by_path(struct cmd_context *cmd, const char *pv_name); int add_pv_to_vg(struct volume_group *vg, const char *pv_name, struct physical_volume *pv); -- 2.43.5