shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

lvmcache/lvmetad: cache PV extension version

Browse Source 
Store PV extension version in lvmcache/lvmetad for use throughout the code.
This commit is contained in:
Peter Rajnoha 2016-02-11 16:25:36 +01:00
parent 7593221f94
commit 71ea2e1602
6 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cache/lvmcache.c vendored
View File

@ -42,6 +42,7 @@ struct lvmcache_info {
const struct format_type *fmt; const struct format_type *fmt;
struct device *dev; struct device *dev;
uint64_t device_size; /* Bytes */ uint64_t device_size; /* Bytes */
uint32_t ext_version; /* Extension version */
uint32_t ext_flags; /* Extension flags */ uint32_t ext_flags; /* Extension flags */
uint32_t status; uint32_t status;
}; };
@ -2366,6 +2367,14 @@ void lvmcache_set_device_size(struct lvmcache_info *info, uint64_t size) {
struct device *lvmcache_device(struct lvmcache_info *info) { struct device *lvmcache_device(struct lvmcache_info *info) {
return info->dev; return info->dev;
} }
void lvmcache_set_ext_version(struct lvmcache_info *info, uint32_t version)
{
info->ext_version = version;
}
uint32_t lvmcache_ext_version(struct lvmcache_info *info) {
return info->ext_version;
}
void lvmcache_set_ext_flags(struct lvmcache_info *info, uint32_t flags) { void lvmcache_set_ext_flags(struct lvmcache_info *info, uint32_t flags) {
info->ext_flags = flags; info->ext_flags = flags;

2
lib/cache/lvmcache.h vendored
View File

@ -156,6 +156,8 @@ int lvmcache_add_mda(struct lvmcache_info *info, struct device *dev,
int lvmcache_add_da(struct lvmcache_info *info, uint64_t start, uint64_t size); int lvmcache_add_da(struct lvmcache_info *info, uint64_t start, uint64_t size);
int lvmcache_add_ba(struct lvmcache_info *info, uint64_t start, uint64_t size); int lvmcache_add_ba(struct lvmcache_info *info, uint64_t start, uint64_t size);
void lvmcache_set_ext_version(struct lvmcache_info *info, uint32_t version);
uint32_t lvmcache_ext_version(struct lvmcache_info *info);
void lvmcache_set_ext_flags(struct lvmcache_info *info, uint32_t flags); void lvmcache_set_ext_flags(struct lvmcache_info *info, uint32_t flags);
uint32_t lvmcache_ext_flags(struct lvmcache_info *info); uint32_t lvmcache_ext_flags(struct lvmcache_info *info);

3
lib/cache/lvmetad.c vendored
View File

@ -369,6 +369,7 @@ static int _pv_populate_lvmcache(struct cmd_context *cmd,
uint64_t devsize = dm_config_find_int64(cn->child, "dev_size", 0), uint64_t devsize = dm_config_find_int64(cn->child, "dev_size", 0),
label_sector = dm_config_find_int64(cn->child, "label_sector", 0); label_sector = dm_config_find_int64(cn->child, "label_sector", 0);
uint32_t ext_flags = (uint32_t) dm_config_find_int64(cn->child, "ext_flags", 0); uint32_t ext_flags = (uint32_t) dm_config_find_int64(cn->child, "ext_flags", 0);
uint32_t ext_version = (uint32_t) dm_config_find_int64(cn->child, "ext_version", 0);
if (!fmt && fmt_name) if (!fmt && fmt_name)
fmt = get_format_by_name(cmd, fmt_name); fmt = get_format_by_name(cmd, fmt_name);
@ -481,6 +482,7 @@ static int _pv_populate_lvmcache(struct cmd_context *cmd,
lvmcache_set_preferred_duplicates((const char *)&vgid); lvmcache_set_preferred_duplicates((const char *)&vgid);
lvmcache_set_ext_flags(info, ext_flags); lvmcache_set_ext_flags(info, ext_flags);
lvmcache_set_ext_version(info, ext_version);
return 1; return 1;
} }
@ -1051,6 +1053,7 @@ int lvmetad_pv_found(const struct id *pvid, struct device *dev, const struct for
"format = %s", fmt->name, "format = %s", fmt->name,
"label_sector = %"PRId64, (int64_t) label_sector, "label_sector = %"PRId64, (int64_t) label_sector,
"id = %s", uuid, "id = %s", uuid,
"ext_version = %"PRId64, (int64_t) lvmcache_ext_version(info),
"ext_flags = %"PRId64, (int64_t) lvmcache_ext_flags(info), "ext_flags = %"PRId64, (int64_t) lvmcache_ext_flags(info),
NULL)) NULL))
{ {

1
lib/format1/lvm1-label.c
View File

@ -80,6 +80,7 @@ static int _lvm1_read(struct labeller *l, struct device *dev, void *buf,
*label = lvmcache_get_label(info); *label = lvmcache_get_label(info);
lvmcache_set_device_size(info, ((uint64_t)xlate32(pvd->pv_size)) << SECTOR_SHIFT); lvmcache_set_device_size(info, ((uint64_t)xlate32(pvd->pv_size)) << SECTOR_SHIFT);
lvmcache_set_ext_version(info, 0);
lvmcache_set_ext_flags(info, 0); lvmcache_set_ext_flags(info, 0);
lvmcache_del_mdas(info); lvmcache_del_mdas(info);
lvmcache_del_bas(info); lvmcache_del_bas(info);

1
lib/format_pool/disk_rep.c
View File

@ -104,6 +104,7 @@ int read_pool_label(struct pool_list *pl, struct labeller *l,
*label = lvmcache_get_label(info); *label = lvmcache_get_label(info);
lvmcache_set_device_size(info, ((uint64_t)xlate32_be(pd->pl_blocks)) << SECTOR_SHIFT); lvmcache_set_device_size(info, ((uint64_t)xlate32_be(pd->pl_blocks)) << SECTOR_SHIFT);
lvmcache_set_ext_version(info, 0);
lvmcache_set_ext_flags(info, 0); lvmcache_set_ext_flags(info, 0);
lvmcache_del_mdas(info); lvmcache_del_mdas(info);
lvmcache_del_bas(info); lvmcache_del_bas(info);

3
lib/format_text/text_label.c
View File

@ -421,6 +421,9 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf,
log_debug_metadata("%s: PV header extension version %" PRIu32 " found", log_debug_metadata("%s: PV header extension version %" PRIu32 " found",
dev_name(dev), ext_version); dev_name(dev), ext_version);
/* Extension version */
lvmcache_set_ext_version(info, xlate32(pvhdr_ext->version));
/* Extension flags */ /* Extension flags */
lvmcache_set_ext_flags(info, xlate32(pvhdr_ext->flags)); lvmcache_set_ext_flags(info, xlate32(pvhdr_ext->flags));