From 2b82bd79f59ffb49cc864cf0d2e9268c652443d3 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 8 Dec 2010 20:50:48 +0000 Subject: Rename vg_release to free_vg. --- lib/activate/activate.c | 14 ++++---- lib/cache/lvmcache.c | 2 +- lib/format_text/archive.c | 2 +- lib/format_text/archiver.c | 6 ++-- lib/format_text/format-text.c | 4 +-- lib/locking/locking.h | 4 +-- lib/metadata/metadata-exported.h | 6 ++-- lib/metadata/metadata.c | 72 +++++++++++++++++++++------------------- lib/metadata/replicator_manip.c | 8 ++--- 9 files changed, 60 insertions(+), 58 deletions(-) (limited to 'lib') diff --git a/lib/activate/activate.c b/lib/activate/activate.c index a19d5567..88cb184a 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -491,7 +491,7 @@ int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, origin_only = 0; r = lv_info(cmd, lv, origin_only, info, with_open_count, with_read_ahead); - vg_release(lv->vg); + free_vg(lv->vg); return r; } @@ -1052,10 +1052,10 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, r = 1; out: if (lv_pre) - vg_release(lv_pre->vg); + free_vg(lv_pre->vg); if (lv) { lv_release_replicator_vgs(lv); - vg_release(lv->vg); + free_vg(lv->vg); } return r; @@ -1120,7 +1120,7 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, r = 1; out: if (lv) - vg_release(lv->vg); + free_vg(lv->vg); return r; } @@ -1213,7 +1213,7 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s) out: if (lv) { lv_release_replicator_vgs(lv); - vg_release(lv->vg); + free_vg(lv->vg); } return r; @@ -1243,7 +1243,7 @@ int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s, r = 1; out: if (lv) - vg_release(lv->vg); + free_vg(lv->vg); return r; } @@ -1313,7 +1313,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, out: if (lv) { lv_release_replicator_vgs(lv); - vg_release(lv->vg); + free_vg(lv->vg); } return r; diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 35b69866..ab16536c 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -643,7 +643,7 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted) if (!(vg = import_vg_from_buffer(vginfo->vgmetadata, fid))) { _free_cached_vgmetadata(vginfo); - vg_release(vg); + free_vg(vg); return_NULL; } diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index bf16da57..43425dc3 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -329,7 +329,7 @@ static void _display_archive(struct cmd_context *cmd, struct archive_file *af) log_print("Description:\t%s", desc ? : ""); log_print("Backup Time:\t%s", ctime(&when)); - vg_release(vg); + free_vg(vg); tf->fmt->ops->destroy_instance(tf); } diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 3ace6281..ef85c6cb 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -365,7 +365,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, log_error("Cannot restore Volume Group %s with %i PVs " "marked as missing.", vg->name, missing_pvs); - vg_release(vg); + free_vg(vg); return r; } @@ -446,14 +446,14 @@ void check_current_backup(struct volume_group *vg) (vg->seqno == vg_backup->seqno) && (id_equal(&vg->id, &vg_backup->id))) { log_suppress(old_suppress); - vg_release(vg_backup); + free_vg(vg_backup); return; } log_suppress(old_suppress); if (vg_backup) { archive(vg_backup); - vg_release(vg_backup); + free_vg(vg_backup); } archive(vg); backup_locally(vg); diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 1f09b7b9..13a8482d 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -857,7 +857,7 @@ static struct volume_group *_vg_read_file_name(struct format_instance *fid, * check that it contains the correct volume group. */ if (vgname && strcmp(vgname, vg->name)) { - dm_pool_destroy(vg->vgmem); + free_vg(vg); log_error("'%s' does not contain volume group '%s'.", read_path, vgname); return NULL; @@ -1085,7 +1085,7 @@ static int _scan_file(const struct format_type *fmt) path))) { /* FIXME Store creation host in vg */ lvmcache_update_vg(vg, 0); - dm_pool_destroy(vg->vgmem); + free_vg(vg); } } diff --git a/lib/locking/locking.h b/lib/locking/locking.h index cb1a55f0..88935004 100644 --- a/lib/locking/locking.h +++ b/lib/locking/locking.h @@ -143,10 +143,10 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname); 0) #define unlock_vg(cmd, vol) lock_vol(cmd, vol, LCK_VG_UNLOCK) -#define unlock_and_release_vg(cmd, vg, vol) \ +#define unlock_and_free_vg(cmd, vg, vol) \ do { \ unlock_vg(cmd, vol); \ - vg_release(vg); \ + free_vg(vg); \ } while (0) #define resume_lv(cmd, lv) lock_lv_vol(cmd, lv, LCK_LV_RESUME) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index c348d8b3..6994e0c1 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -425,10 +425,10 @@ int remove_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, force_t force); /* - * vg_release() must be called on every struct volume_group allocated + * free_vg() must be called on every struct volume_group allocated * by vg_create() or vg_read_internal() to free it when no longer required. */ -void vg_release(struct volume_group *vg); +void free_vg(struct volume_group *vg); /* Manipulate LVs */ struct logical_volume *lv_create_empty(const char *name, @@ -682,7 +682,7 @@ struct cmd_vg *cmd_vg_add(struct dm_pool *mem, struct dm_list *cmd_vgs, struct cmd_vg *cmd_vg_lookup(struct dm_list *cmd_vgs, const char *vg_name, const char *vgid); int cmd_vg_read(struct cmd_context *cmd, struct dm_list *cmd_vgs); -void cmd_vg_release(struct dm_list *cmd_vgs); +void free_cmd_vgs(struct dm_list *cmd_vgs); int find_replicator_vgs(struct logical_volume *lv); diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index d913df01..3b7061c5 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -366,7 +366,7 @@ int get_pv_from_vg_by_id(const struct format_type *fmt, const char *vg_name, } } out: - vg_release(vg); + free_vg(vg); return r; } @@ -920,7 +920,7 @@ struct volume_group *vg_create(struct cmd_context *cmd, const char *vg_name) /* is this vg name already in use ? */ if ((vg = vg_read_internal(cmd, vg_name, NULL, 1, &consistent))) { log_error("A volume group called '%s' already exists.", vg_name); - unlock_and_release_vg(cmd, vg, vg_name); + unlock_and_free_vg(cmd, vg, vg_name); return _vg_make_handle(cmd, NULL, FAILED_EXIST); } @@ -988,7 +988,7 @@ struct volume_group *vg_create(struct cmd_context *cmd, const char *vg_name) return _vg_make_handle(cmd, vg, SUCCESS); bad: - unlock_and_release_vg(cmd, vg, vg_name); + unlock_and_free_vg(cmd, vg, vg_name); /* FIXME: use _vg_make_handle() w/proper error code */ return NULL; } @@ -2700,7 +2700,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, } return correct_vg; } else { - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = NULL; } @@ -2741,7 +2741,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, (!use_precommitted && !(vg = mda->ops->vg_read(fid, vgname, mda)))) { inconsistent = 1; - vg_release(vg); + free_vg(vg); continue; } if (!correct_vg) { @@ -2760,13 +2760,13 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, inconsistent_seqno = 1; } if (vg->seqno > correct_vg->seqno) { - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = vg; } } if (vg != correct_vg) - vg_release(vg); + free_vg(vg); } /* Ensure every PV in the VG was in the cache */ @@ -2841,7 +2841,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (memlock()) inconsistent = 1; else { - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = NULL; } } else dm_list_iterate_items(pvl, &correct_vg->pvs) { @@ -2850,14 +2850,14 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (!str_list_match_item(pvids, pvl->pv->dev->pvid)) { log_debug("Cached VG %s had incorrect PV list", vgname); - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = NULL; break; } } if (correct_vg && inconsistent_mdas) { - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = NULL; } } @@ -2896,7 +2896,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (!correct_vg) { correct_vg = vg; if (!_update_pv_list(cmd->mem, &all_pvs, correct_vg)) { - vg_release(vg); + free_vg(vg); return_NULL; } continue; @@ -2920,18 +2920,18 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, inconsistent_seqno = 1; } if (!_update_pv_list(cmd->mem, &all_pvs, vg)) { - vg_release(vg); - vg_release(correct_vg); + free_vg(vg); + free_vg(correct_vg); return_NULL; } if (vg->seqno > correct_vg->seqno) { - vg_release(correct_vg); + free_vg(correct_vg); correct_vg = vg; } } if (vg != correct_vg) - vg_release(vg); + free_vg(vg); } /* Give up looking */ @@ -2961,7 +2961,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, *consistent = 0; return correct_vg; } - vg_release(correct_vg); + free_vg(correct_vg); return NULL; } @@ -2989,7 +2989,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, cmd->handles_missing_pvs = 1; if (!vg_write(correct_vg)) { log_error("Automatic metadata correction failed"); - vg_release(correct_vg); + free_vg(correct_vg); cmd->handles_missing_pvs = saved_handles_missing_pvs; return NULL; } @@ -2998,7 +2998,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (!vg_commit(correct_vg)) { log_error("Automatic metadata correction commit " "failed"); - vg_release(correct_vg); + free_vg(correct_vg); return NULL; } @@ -3008,13 +3008,13 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, goto next_pv; } if (!id_write_format(&pvl->pv->id, uuid, sizeof(uuid))) { - vg_release(correct_vg); + free_vg(correct_vg); return_NULL; } log_error("Removing PV %s (%s) that no longer belongs to VG %s", pv_dev_name(pvl->pv), uuid, correct_vg->name); if (!pv_write_orphan(cmd, pvl->pv)) { - vg_release(correct_vg); + free_vg(correct_vg); return_NULL; } @@ -3036,7 +3036,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, "volume group %s", correct_vg->name); log_error("Please restore the metadata by running " "vgcfgrestore."); - vg_release(correct_vg); + free_vg(correct_vg); return NULL; } @@ -3056,7 +3056,7 @@ struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgnam if (!check_pv_segments(vg)) { log_error(INTERNAL_ERROR "PV segments corrupted in %s.", vg->name); - vg_release(vg); + free_vg(vg); return NULL; } @@ -3064,7 +3064,7 @@ struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgnam if (!check_lv_segments(lvl->lv, 0)) { log_error(INTERNAL_ERROR "LV segments corrupted in %s.", lvl->lv->name); - vg_release(vg); + free_vg(vg); return NULL; } } @@ -3076,7 +3076,7 @@ struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgnam if (!check_lv_segments(lvl->lv, 1)) { log_error(INTERNAL_ERROR "LV segments corrupted in %s.", lvl->lv->name); - vg_release(vg); + free_vg(vg); return NULL; } } @@ -3084,14 +3084,16 @@ struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgnam return vg; } -void vg_release(struct volume_group *vg) +void free_vg(struct volume_group *vg) { - if (!vg || !vg->vgmem) + if (!vg) return; - if (vg->cmd && vg->vgmem == vg->cmd->mem) + if (vg->cmd && vg->vgmem == vg->cmd->mem) { log_error(INTERNAL_ERROR "global memory pool used for VG %s", vg->name); + return; + } dm_pool_destroy(vg->vgmem); } @@ -3122,7 +3124,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, "inconsistent", vg->name); return vg; } - vg_release(vg); + free_vg(vg); } /* Mustn't scan if memory locked: ensure cache gets pre-populated! */ @@ -3151,12 +3153,12 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, if (!consistent) { log_error("Volume group %s metadata is " "inconsistent", vgname); - vg_release(vg); + free_vg(vg); return NULL; } return vg; } - vg_release(vg); + free_vg(vg); } return NULL; @@ -3190,7 +3192,7 @@ struct logical_volume *lv_from_lvid(struct cmd_context *cmd, const char *lvid_s, return lvl->lv; out: - vg_release(vg); + free_vg(vg); return NULL; } @@ -3384,12 +3386,12 @@ static int _get_pvs(struct cmd_context *cmd, int warnings, struct dm_list **pvsl dm_list_iterate_items(pvl, &vg->pvs) { if (!(pvl_copy = _copy_pvl(cmd->mem, pvl))) { log_error("PV list allocation failed"); - vg_release(vg); + free_vg(vg); return 0; } dm_list_add(results, &pvl_copy->list); } - vg_release(vg); + free_vg(vg); } init_pvmove(old_pvmove); @@ -3592,7 +3594,7 @@ static struct volume_group *_recover_vg(struct cmd_context *cmd, return_NULL; if (!consistent) { - vg_release(vg); + free_vg(vg); return_NULL; } @@ -3664,7 +3666,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha /* consistent == 0 when VG is not found, but failed == FAILED_NOTFOUND */ if (!consistent && !failure) { - vg_release(vg); + free_vg(vg); if (!(vg = _recover_vg(cmd, vg_name, vgid))) { log_error("Recovery of volume group \"%s\" failed.", vg_name); diff --git a/lib/metadata/replicator_manip.c b/lib/metadata/replicator_manip.c index b3a2fff6..79abca04 100644 --- a/lib/metadata/replicator_manip.c +++ b/lib/metadata/replicator_manip.c @@ -590,16 +590,16 @@ int cmd_vg_read(struct cmd_context *cmd, struct dm_list *cmd_vgs) * * \param cmd_vgs Contains list of cmd_vg entries. */ -void cmd_vg_release(struct dm_list *cmd_vgs) +void free_cmd_vgs(struct dm_list *cmd_vgs) { struct cmd_vg *cvl; /* Backward iterate cmd_vg list */ dm_list_iterate_back_items(cvl, cmd_vgs) { if (vg_read_error(cvl->vg)) - vg_release(cvl->vg); + free_vg(cvl->vg); else - unlock_and_release_vg(cvl->vg->cmd, cvl->vg, cvl->vg_name); + unlock_and_free_vg(cvl->vg->cmd, cvl->vg, cvl->vg_name); cvl->vg = NULL; } } @@ -687,7 +687,7 @@ void lv_release_replicator_vgs(struct logical_volume *lv) dm_list_iterate_back_items(rsite, &first_seg(lv)->replicator->rsites) if (rsite->vg_name && rsite->vg) { - vg_release(rsite->vg); + free_vg(rsite->vg); rsite->vg = NULL; } } -- cgit