Make add_metadata_area_to_pv/remove_metadata_area_from_pv static.

No need to put these in format-text.h, it's not used anywhere else actually.

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 1a7420486e995bfdd8a6eaab09d695b414c67a02..77703efe969fcdb0f42e82d71bfb54905b838c88 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -1848,11 +1848,11 @@ out:
        return 1;
 }
 
-int add_metadata_area_to_pv(struct physical_volume *pv,
-                           unsigned mda_index,
-                           uint64_t mda_start,
-                           uint64_t mda_size,
-                           unsigned mda_ignored)
+static int _add_metadata_area_to_pv(struct physical_volume *pv,
+                                   unsigned mda_index,
+                                   uint64_t mda_start,
+                                   uint64_t mda_size,
+                                   unsigned mda_ignored)
 {
        struct metadata_area *mda;
        struct mda_context *mdac;
@@ -2101,8 +2101,8 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt,
                }
 
                /* Finally, add new metadata area to PV's format instance. */
-               if (!add_metadata_area_to_pv(pv, mda_index, mda_start,
-                                            mda_size, mda_ignored))
+               if (!_add_metadata_area_to_pv(pv, mda_index, mda_start,
+                                             mda_size, mda_ignored))
                        return_0;
        }
 
@@ -2114,8 +2114,8 @@ bad:
        return 0;
 }
 
-int remove_metadata_area_from_pv(struct physical_volume *pv,
-                                unsigned mda_index)
+static int _remove_metadata_area_from_pv(struct physical_volume *pv,
+                                        unsigned mda_index)
 {
        if (mda_index >= FMT_TEXT_MAX_MDAS_PER_PV) {
                log_error(INTERNAL_ERROR "can't remove metadata area with "
@@ -2134,7 +2134,7 @@ static int _text_pv_remove_metadata_area(const struct format_type *fmt,
                                         struct physical_volume *pv,
                                         unsigned mda_index)
 {
-       return remove_metadata_area_from_pv(pv, mda_index);
+       return _remove_metadata_area_from_pv(pv, mda_index);
 }
 
 static int _text_pv_resize(const struct format_type *fmt,

diff --git a/lib/format_text/format-text.h b/lib/format_text/format-text.h
index 694b5c1b4bd0721be20395574e8636b1d056a1f4..87fe1bef288fec31d8d5a9154eb45413a02402d3 100644 (file)
--- a/lib/format_text/format-text.h
+++ b/lib/format_text/format-text.h
@@ -55,14 +55,6 @@ int pvhdr_read(struct device *dev, char *buf);
 int add_da(struct dm_pool *mem, struct dm_list *das,
           uint64_t start, uint64_t size);
 void del_das(struct dm_list *das);
-
-int add_metadata_area_to_pv(struct physical_volume *pv,
-                           unsigned mda_index,
-                           uint64_t mda_start,
-                           uint64_t mda_size,
-                           unsigned mda_ignored);
-int remove_metadata_area_from_pv(struct physical_volume *pv,
-                                unsigned mda_index);
 int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list *mdas,
            struct device *dev, uint64_t start, uint64_t size, unsigned ignored);
 void del_mdas(struct dm_list *mdas);