Change pv_read_path to pv_by_path

diff --git a/WHATS_NEW b/WHATS_NEW
index e51820e40f182851470425ed34d97479baeb882e..8cc708edcfa49298b16c98c5b0dcbb33d416a686 100644 (file)
--- 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 ff8968de24a24a6f14b0854e20e17367a509c027..7f0764915da1d6eb70385d7135e0538ecd6a113d 100644 (file)
--- 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 202d9fdba37a238946d27f03476937b0fb1e7b8d..9d1972f922abf0ec5a671f622ccf8e5f6ec376a4 100644 (file)
--- 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);