diff options
Diffstat (limited to 'lib/format_text/import-export.h')
| -rw-r--r-- | lib/format_text/import-export.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h index d4e25f0e7..be889944e 100644 --- a/lib/format_text/import-export.h +++ b/lib/format_text/import-export.h @@ -18,6 +18,7 @@ #include "config.h" #include "metadata.h" +#include "lvmcache.h" #include <stdio.h> @@ -46,13 +47,13 @@ struct text_vg_version_ops { int (*check_version) (const struct dm_config_tree * cf); struct volume_group *(*read_vg) (struct format_instance * fid, const struct dm_config_tree *cf, - unsigned use_cached_pvs); + unsigned use_cached_pvs, + unsigned allow_lvmetad_extensions); void (*read_desc) (struct dm_pool * mem, const struct dm_config_tree *cf, time_t *when, char **desc); - const char *(*read_vgname) (const struct format_type *fmt, - const struct dm_config_tree *cft, - struct id *vgid, uint64_t *vgstatus, - char **creation_host); + int (*read_vgname) (const struct format_type *fmt, + const struct dm_config_tree *cft, + struct lvmcache_vgsummary *vgsummary); }; struct text_vg_version_ops *text_vg_vsn1_init(void); @@ -60,9 +61,6 @@ struct text_vg_version_ops *text_vg_vsn1_init(void); int print_flags(uint64_t status, int type, char *buffer, size_t size); int read_flags(uint64_t *status, int type, const struct dm_config_value *cv); -char *alloc_printed_tags(struct dm_list *tags); -int read_tags(struct dm_pool *mem, struct dm_list *tags, const struct dm_config_value *cv); - int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp); size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf); struct volume_group *text_vg_import_file(struct format_instance *fid, @@ -70,6 +68,8 @@ struct volume_group *text_vg_import_file(struct format_instance *fid, time_t *when, char **desc); struct volume_group *text_vg_import_fd(struct format_instance *fid, const char *file, + struct cached_vg_fmtdata **vg_fmtdata, + unsigned *use_previous_vg, int single_device, struct device *dev, off_t offset, uint32_t size, @@ -77,12 +77,13 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, checksum_fn_t checksum_fn, uint32_t checksum, time_t *when, char **desc); -const char *text_vgname_import(const struct format_type *fmt, - struct device *dev, - off_t offset, uint32_t size, - off_t offset2, uint32_t size2, - checksum_fn_t checksum_fn, uint32_t checksum, - struct id *vgid, uint64_t *vgstatus, - char **creation_host); + +int text_vgname_import(const struct format_type *fmt, + struct device *dev, + off_t offset, uint32_t size, + off_t offset2, uint32_t size2, + checksum_fn_t checksum_fn, + int checksum_only, + struct lvmcache_vgsummary *vgsummary); #endif |