summaryrefslogtreecommitdiffstats
path: root/lib/metadata
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2010-10-25 13:54:29 +0000
committerAlasdair Kergon <agk@redhat.com>2010-10-25 13:54:29 +0000
commit2aa06d73ca75635a6874255409033839b2c26192 (patch)
tree2b75fb0117b57313f787c65baa2eda8d231b2e27 /lib/metadata
parent3f329bd02caeed8bcd8bbedb59eec0bd9c795701 (diff)
downloadlvm2-2aa06d73ca75635a6874255409033839b2c26192.tar.gz
lvm2-2aa06d73ca75635a6874255409033839b2c26192.tar.xz
lvm2-2aa06d73ca75635a6874255409033839b2c26192.zip
pre-release
Diffstat (limited to 'lib/metadata')
-rw-r--r--lib/metadata/lv.c1
-rw-r--r--lib/metadata/metadata.c16
-rw-r--r--lib/metadata/metadata.h1
-rw-r--r--lib/metadata/vg.c1
4 files changed, 2 insertions, 17 deletions
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index b7a8700a..744b7b0c 100644
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -15,6 +15,7 @@
#include "lib.h"
#include "metadata.h"
+#include "display.h"
#include "activate.h"
#include "toolcontext.h"
#include "segtype.h"
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index aaf79d8a..e81f87fc 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -3957,22 +3957,6 @@ int pv_change_metadataignore(struct physical_volume *pv, uint32_t mda_ignored)
return 1;
}
-char alloc_policy_char(alloc_policy_t alloc)
-{
- switch (alloc) {
- case ALLOC_CONTIGUOUS:
- return 'c';
- case ALLOC_CLING:
- return 'l';
- case ALLOC_NORMAL:
- return 'n';
- case ALLOC_ANYWHERE:
- return 'a';
- default:
- return 'i';
- }
-}
-
char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tags)
{
struct str_list *sl;
diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 8e950a9d..5aa9c193 100644
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -412,7 +412,6 @@ int vg_mark_partial_lvs(struct volume_group *vg);
int is_mirror_image_removable(struct logical_volume *mimage_lv, void *baton);
uint64_t find_min_mda_size(struct dm_list *mdas);
-char alloc_policy_char(alloc_policy_t alloc);
char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tags);
#endif
diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c
index 2c73861b..9d0d5dd7 100644
--- a/lib/metadata/vg.c
+++ b/lib/metadata/vg.c
@@ -15,6 +15,7 @@
#include "lib.h"
#include "metadata.h"
+#include "display.h"
#include "activate.h"
char *vg_fmt_dup(const struct volume_group *vg)