shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

lvmetad: Re-use fmt from the VG for PVs when possible.

Browse Source
This commit is contained in:
Petr Rockai 2015-01-06 12:39:57 +01:00
parent 509650ec4c
commit 0987f290a7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/cache/lvmetad.c vendored
View File

@ -264,7 +264,7 @@ static int _read_mda(struct lvmcache_info *info,
static struct lvmcache_info *_pv_populate_lvmcache(struct cmd_context *cmd, static struct lvmcache_info *_pv_populate_lvmcache(struct cmd_context *cmd,
struct dm_config_node *cn, struct dm_config_node *cn,
dev_t fallback) struct format_type *fmt, dev_t fallback)
{ {
struct device *dev; struct device *dev;
struct id pvid, vgid; struct id pvid, vgid;
@ -283,7 +283,8 @@ static struct lvmcache_info *_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);
struct format_type *fmt = fmt_name ? get_format_by_name(cmd, fmt_name) : NULL; if (!fmt && fmt_name)
fmt = get_format_by_name(cmd, fmt_name);
if (!fmt) { if (!fmt) {
log_error("PV %s not recognised. Is the device missing?", pvid_txt); log_error("PV %s not recognised. Is the device missing?", pvid_txt);
@ -422,7 +423,7 @@ struct volume_group *lvmetad_vg_lookup(struct cmd_context *cmd, const char *vgna
if ((pvcn = dm_config_find_node(top, "metadata/physical_volumes"))) if ((pvcn = dm_config_find_node(top, "metadata/physical_volumes")))
for (pvcn = pvcn->child; pvcn; pvcn = pvcn->sib) for (pvcn = pvcn->child; pvcn; pvcn = pvcn->sib)
_pv_populate_lvmcache(cmd, pvcn, 0); _pv_populate_lvmcache(cmd, pvcn, fmt, 0);
top->key = name; top->key = name;
if (!(vg = import_vg_from_config_tree(reply.cft, fid))) if (!(vg = import_vg_from_config_tree(reply.cft, fid)))
@ -573,7 +574,7 @@ int lvmetad_pv_lookup(struct cmd_context *cmd, struct id pvid, int *found)
if (!(cn = dm_config_find_node(reply.cft->root, "physical_volume"))) if (!(cn = dm_config_find_node(reply.cft->root, "physical_volume")))
goto_out; goto_out;
else if (!_pv_populate_lvmcache(cmd, cn, 0)) else if (!_pv_populate_lvmcache(cmd, cn, NULL, 0))
goto_out; goto_out;
out_success: out_success:
@ -603,7 +604,7 @@ int lvmetad_pv_lookup_by_dev(struct cmd_context *cmd, struct device *dev, int *f
goto out_success; goto out_success;
cn = dm_config_find_node(reply.cft->root, "physical_volume"); cn = dm_config_find_node(reply.cft->root, "physical_volume");
if (!cn || !_pv_populate_lvmcache(cmd, cn, dev->dev)) if (!cn || !_pv_populate_lvmcache(cmd, cn, NULL, dev->dev))
goto_out; goto_out;
out_success: out_success:
@ -631,7 +632,7 @@ int lvmetad_pv_list_to_lvmcache(struct cmd_context *cmd)
if ((cn = dm_config_find_node(reply.cft->root, "physical_volumes"))) if ((cn = dm_config_find_node(reply.cft->root, "physical_volumes")))
for (cn = cn->child; cn; cn = cn->sib) for (cn = cn->child; cn; cn = cn->sib)
_pv_populate_lvmcache(cmd, cn, 0); _pv_populate_lvmcache(cmd, cn, NULL, 0);
daemon_reply_destroy(reply); daemon_reply_destroy(reply);