metadata: Nuke the exported "pv_read" function.

diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index c00e4e580da029c9d2dd9790470b05cc1405e879..1bf5236e02e754ae766292130c998b4da0dbdafe 100644 (file)
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -505,9 +505,6 @@ int vg_commit(struct volume_group *vg);
 void vg_revert(struct volume_group *vg);
 struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name,
                                      const char *vgid, int warnings, int *consistent);
-struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name,
-                               int warnings,
-                               int scan_label_only);
 
 #define get_pvs( cmd ) get_pvs_internal((cmd), NULL, NULL)
 #define get_pvs_perserve_vg( cmd, pv_list, vg_list ) get_pvs_internal((cmd), (pv_list), (vg_list))

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index fa480c81f2e56c9173033cc52cf57e3871086834..aa5f124c09584c12114dc5c9c3855ef917fb89bc 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1339,20 +1339,6 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
        if (!(pv = find_pv_by_name(cmd, name, 1)))
                stack;
 
-       /*
-        * If a PV has no MDAs it may appear to be an orphan until the
-        * metadata is read off another PV in the same VG.  Detecting
-        * this means checking every VG by scanning every PV on the
-        * system.
-        */
-       if (pv && is_orphan(pv) && dm_list_empty(&pv->fid->metadata_areas_in_use)) {
-               free_pv_fid(pv);
-               if (!scan_vgs_for_pvs(cmd, 0))
-                       return_0;
-               if (!(pv = pv_read(cmd, name, 0, 0)))
-                       stack;
-       }
-
        /* Allow partial & exported VGs to be destroyed. */
        /* We must have -ff to overwrite a non orphan */
        if (pv && !is_orphan(pv) && pp->force != DONT_PROMPT_OVERRIDE) {
@@ -3652,28 +3638,6 @@ const char *find_vgname_from_pvname(struct cmd_context *cmd,
        return find_vgname_from_pvid(cmd, pvid);
 }
 
-/**
- * pv_read - read and return a handle to a physical volume
- * @cmd: LVM command initiating the pv_read
- * @pv_name: full device name of the PV, including the path
- * @mdas: list of metadata areas of the PV
- * @label_sector: sector number where the PV label is stored on @pv_name
- * @warnings:
- *
- * Returns:
- *   PV handle - valid pv_name and successful read of the PV, or
- *   NULL - invalid parameter or error in reading the PV
- *
- * Note:
- *   FIXME - liblvm todo - make into function that returns handle
- */
-struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name,
-                               int warnings,
-                               int scan_label_only)
-{
-       return _pv_read(cmd, cmd->mem, pv_name, NULL, warnings, scan_label_only);
-}
-
 /* FIXME Use label functions instead of PV functions */
 static struct physical_volume *_pv_read(struct cmd_context *cmd,
                                        struct dm_pool *pvmem,