shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Change import_vg_from_buffer to use config_tree

Browse Source 
Change function import_vg_from_buffer() to import_vg_from_config_tree().
Instead of creating config tree inside the function allow config tree to
be passed as parameter - usable later for caching.
This commit is contained in:
Zdenek Kabelac 2011-01-10 13:13:42 +00:00
parent 12fbaae042
commit 6feecf76d4
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.80 -
====================================
Pass config_tree to renamed function import_vg_from_config_tree().
Detect NULL handle in get_property().
Fix superfluous /usr in ocf_scriptdir instalation path.
Add --with-ocfdir configurable option.

13
lib/cache/lvmcache.c vendored
View File

@ -26,6 +26,7 @@
#include "format-text.h"
#include "format_pool.h"
#include "format1.h"
#include "config.h"
static struct dm_hash_table *_pvid_hash = NULL;
static struct dm_hash_table *_vgid_hash = NULL;
@ -650,12 +651,20 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)
vgid, NULL)))
return_NULL;
if (!(vg = import_vg_from_buffer(vginfo->vgmetadata, fid))) {
if (!(vginfo->cft =
create_config_tree_from_string(fid->fmt->cmd,
vginfo->vgmetadata))) {
_free_cached_vgmetadata(vginfo);
free_vg(vg);
return_NULL;
}
if (!(vg = import_vg_from_config_tree(vginfo->cft, fid))) {
_free_cached_vgmetadata(vginfo);
destroy_config_tree(vginfo->cft);
return_NULL;
}
destroy_config_tree(vginfo->cft);
log_debug("Using cached %smetadata for VG %s.",
vginfo->precommitted ? "pre-committed" : "", vginfo->vgname);

2
lib/cache/lvmcache.h vendored
View File

@ -33,6 +33,7 @@
struct cmd_context;
struct format_type;
struct volume_group;
struct config_tree;
/* One per VG */
struct lvmcache_vginfo {
@ -46,6 +47,7 @@ struct lvmcache_vginfo {
struct lvmcache_vginfo *next; /* Another VG with same name? */
char *creation_host;
char *vgmetadata; /* Copy of VG metadata as format_text string */
struct config_tree *cft; /* Config tree created from vgmetadata */
unsigned precommitted; /* Is vgmetadata live or precommitted? */
};

9
lib/format_text/import.c
View File

@ -131,18 +131,14 @@ struct volume_group *text_vg_import_file(struct format_instance *fid,
when, desc);
}
struct volume_group *import_vg_from_buffer(const char *buf,
struct format_instance *fid)
struct volume_group *import_vg_from_config_tree(const struct config_tree *cft,
struct format_instance *fid)
{
struct volume_group *vg = NULL;
struct config_tree *cft;
struct text_vg_version_ops **vsn;
_init_text_import();
if (!(cft = create_config_tree_from_string(fid->fmt->cmd, buf)))
return_NULL;
for (vsn = &_text_vsn_list[0]; *vsn; vsn++) {
if (!(*vsn)->check_version(cft))
continue;
@ -155,6 +151,5 @@ struct volume_group *import_vg_from_buffer(const char *buf,
break;
}
destroy_config_tree(cft);
return vg;
}

3
lib/metadata/metadata.h
View File

@ -100,6 +100,7 @@
//#define FMT_RESIZE_PV 0x00000080U /* Supports pvresize? */
//#define FMT_UNLIMITED_STRIPESIZE 0x00000100U /* Unlimited stripe size? */
struct config_tree;
struct metadata_area;
/* Per-format per-metadata area operations */
@ -388,6 +389,8 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahea
int export_vg_to_buffer(struct volume_group *vg, char **buf);
struct volume_group *import_vg_from_buffer(const char *buf,
struct format_instance *fid);
struct volume_group *import_vg_from_config_tree(const struct config_tree *cft,
struct format_instance *fid);
/*
* Mirroring functions