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

clvmd: don't save cft and buf for saved_vg

Browse Source
This commit is contained in:
David Teigland 2018-05-03 10:50:38 -05:00
parent c016b573ee
commit 822a8b62be
1 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/cache/lvmcache.c vendored
View File

@ -87,11 +87,7 @@ struct saved_vg {
*/ */
char vgid[ID_LEN + 1]; char vgid[ID_LEN + 1];
int saved_vg_committed; int saved_vg_committed;
char *saved_vg_old_buf;
struct dm_config_tree *saved_vg_old_cft;
struct volume_group *saved_vg_old; struct volume_group *saved_vg_old;
char *saved_vg_new_buf;
struct dm_config_tree *saved_vg_new_cft;
struct volume_group *saved_vg_new; struct volume_group *saved_vg_new;
struct dm_list saved_vg_to_free; struct dm_list saved_vg_to_free;
}; };
@ -220,11 +216,6 @@ static void _saved_vg_inval(struct saved_vg *svg, int inval_old, int inval_new)
log_debug_cache("lvmcache: inval saved_vg %s old %p", log_debug_cache("lvmcache: inval saved_vg %s old %p",
svg->saved_vg_old->name, svg->saved_vg_old); svg->saved_vg_old->name, svg->saved_vg_old);
if (svg->saved_vg_old_buf)
dm_free(svg->saved_vg_old_buf);
if (svg->saved_vg_old_cft)
dm_config_destroy(svg->saved_vg_old_cft);
if (svg->saved_vg_old) { if (svg->saved_vg_old) {
if ((vgl = dm_zalloc(sizeof(*vgl)))) { if ((vgl = dm_zalloc(sizeof(*vgl)))) {
vgl->vg = svg->saved_vg_old; vgl->vg = svg->saved_vg_old;
@ -232,8 +223,6 @@ static void _saved_vg_inval(struct saved_vg *svg, int inval_old, int inval_new)
} }
} }
svg->saved_vg_old_buf = NULL;
svg->saved_vg_old_cft = NULL;
svg->saved_vg_old = NULL; svg->saved_vg_old = NULL;
} }
@ -242,11 +231,6 @@ static void _saved_vg_inval(struct saved_vg *svg, int inval_old, int inval_new)
log_debug_cache("lvmcache: inval saved_vg %s new pre %p", log_debug_cache("lvmcache: inval saved_vg %s new pre %p",
svg->saved_vg_new->name, svg->saved_vg_new); svg->saved_vg_new->name, svg->saved_vg_new);
if (svg->saved_vg_new_buf)
dm_free(svg->saved_vg_new_buf);
if (svg->saved_vg_new_cft)
dm_config_destroy(svg->saved_vg_new_cft);
if (svg->saved_vg_new) { if (svg->saved_vg_new) {
if ((vgl = dm_zalloc(sizeof(*vgl)))) { if ((vgl = dm_zalloc(sizeof(*vgl)))) {
vgl->vg = svg->saved_vg_new; vgl->vg = svg->saved_vg_new;
@ -254,8 +238,6 @@ static void _saved_vg_inval(struct saved_vg *svg, int inval_old, int inval_new)
} }
} }
svg->saved_vg_new_buf = NULL;
svg->saved_vg_new_cft = NULL;
svg->saved_vg_new = NULL; svg->saved_vg_new = NULL;
} }
} }
@ -272,15 +254,9 @@ static void _saved_vg_free(struct saved_vg *svg, int free_old, int free_new)
svg->saved_vg_old->saved_in_clvmd = 0; svg->saved_vg_old->saved_in_clvmd = 0;
} }
if (svg->saved_vg_old_buf)
dm_free(svg->saved_vg_old_buf);
if (svg->saved_vg_old_cft)
dm_config_destroy(svg->saved_vg_old_cft);
if (svg->saved_vg_old) if (svg->saved_vg_old)
release_vg(svg->saved_vg_old); release_vg(svg->saved_vg_old);
svg->saved_vg_old_buf = NULL;
svg->saved_vg_old_cft = NULL;
svg->saved_vg_old = NULL; svg->saved_vg_old = NULL;
dm_list_iterate_items_safe(vgl, vgl2, &svg->saved_vg_to_free) { dm_list_iterate_items_safe(vgl, vgl2, &svg->saved_vg_to_free) {
@ -301,15 +277,9 @@ static void _saved_vg_free(struct saved_vg *svg, int free_old, int free_new)
svg->saved_vg_new->saved_in_clvmd = 0; svg->saved_vg_new->saved_in_clvmd = 0;
} }
if (svg->saved_vg_new_buf)
dm_free(svg->saved_vg_new_buf);
if (svg->saved_vg_new_cft)
dm_config_destroy(svg->saved_vg_new_cft);
if (svg->saved_vg_new) if (svg->saved_vg_new)
release_vg(svg->saved_vg_new); release_vg(svg->saved_vg_new);
svg->saved_vg_new_buf = NULL;
svg->saved_vg_new_cft = NULL;
svg->saved_vg_new = NULL; svg->saved_vg_new = NULL;
} }
} }
@ -396,18 +366,10 @@ void lvmcache_save_vg(struct volume_group *vg, int precommitted)
save_vg->saved_in_clvmd = 1; save_vg->saved_in_clvmd = 1;
if (old) { if (old) {
/*
svg->saved_vg_old_buf = save_buf;
svg->saved_vg_old_cft = save_cft;
*/
svg->saved_vg_old = save_vg; svg->saved_vg_old = save_vg;
log_debug_cache("lvmcache: saved old vg %s seqno %d %p", log_debug_cache("lvmcache: saved old vg %s seqno %d %p",
save_vg->name, save_vg->seqno, save_vg); save_vg->name, save_vg->seqno, save_vg);
} else { } else {
/*
svg->saved_vg_new_buf = save_buf;
svg->saved_vg_new_cft = save_cft;
*/
svg->saved_vg_new = save_vg; svg->saved_vg_new = save_vg;
log_debug_cache("lvmcache: saved pre vg %s seqno %d %p", log_debug_cache("lvmcache: saved pre vg %s seqno %d %p",
save_vg->name, save_vg->seqno, save_vg); save_vg->name, save_vg->seqno, save_vg);