shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Use lv_is_active instead of lv_info()

Browse Source 
Usage of lv_is_active makes it more obvious what is being checked.
This commit is contained in:
Zdenek Kabelac 2012-01-31 23:42:53 +01:00
parent e431b19bac
commit bf2741376d
4 changed files with 7 additions and 11 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.99 - Version 2.02.99 -
=================================== ===================================
Use lv_is_active() instead of lv_info() call.
Cleanup some log_error message and use log_warn instead. Cleanup some log_error message and use log_warn instead.
Version 2.02.98 - 15th October 2012 Version 2.02.98 - 15th October 2012

5
lib/metadata/lv_manip.c
View File

@ -4218,7 +4218,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, struct l
struct logical_volume *pool_lv; struct logical_volume *pool_lv;
struct lv_list *lvl; struct lv_list *lvl;
int origin_active = 0; int origin_active = 0;
struct lvinfo info;
if (new_lv_name && find_lv_in_vg(vg, new_lv_name)) { if (new_lv_name && find_lv_in_vg(vg, new_lv_name)) {
log_error("Logical volume \"%s\" already exists in " log_error("Logical volume \"%s\" already exists in "
@ -4350,12 +4349,12 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, struct l
log_warn("WARNING: See global/mirror_segtype_default in lvm.conf."); log_warn("WARNING: See global/mirror_segtype_default in lvm.conf.");
} }
if (!lv_info(cmd, org, 0, &info, 0, 0)) { if (!lv_is_active(org)) {
log_error("Check for existence of active snapshot " log_error("Check for existence of active snapshot "
"origin '%s' failed.", org->name); "origin '%s' failed.", org->name);
return NULL; return NULL;
} }
origin_active = info.exists; origin_active = 1;
if (vg_is_clustered(vg) && if (vg_is_clustered(vg) &&
!lv_is_active_exclusive_locally(org)) { !lv_is_active_exclusive_locally(org)) {

9
lib/metadata/mirror.c
View File

@ -282,7 +282,6 @@ static int _init_mirror_log(struct cmd_context *cmd,
struct dm_list *tags, int remove_on_failure) struct dm_list *tags, int remove_on_failure)
{ {
struct str_list *sl; struct str_list *sl;
struct lvinfo info;
uint64_t orig_status = log_lv->status; uint64_t orig_status = log_lv->status;
int was_active = 0; int was_active = 0;
@ -298,14 +297,13 @@ static int _init_mirror_log(struct cmd_context *cmd,
} }
/* If the LV is active, deactivate it first. */ /* If the LV is active, deactivate it first. */
if (lv_info(cmd, log_lv, 0, &info, 0, 0) && info.exists) { if (lv_is_active(log_lv)) {
(void)deactivate_lv(cmd, log_lv);
/* /*
* FIXME: workaround to fail early * FIXME: workaround to fail early
* Ensure that log is really deactivated because deactivate_lv * Ensure that log is really deactivated because deactivate_lv
* on cluster do not fail if there is log_lv with different UUID. * on cluster do not fail if there is log_lv with different UUID.
*/ */
if (lv_info(cmd, log_lv, 0, &info, 0, 0) && info.exists) { if (!deactivate_lv(cmd, log_lv)) {
log_error("Aborting. Unable to deactivate mirror log."); log_error("Aborting. Unable to deactivate mirror log.");
goto revert_new_lv; goto revert_new_lv;
} }
@ -1714,7 +1712,6 @@ int remove_mirror_log(struct cmd_context *cmd,
int force) int force)
{ {
percent_t sync_percent; percent_t sync_percent;
struct lvinfo info;
struct volume_group *vg = lv->vg; struct volume_group *vg = lv->vg;
/* Unimplemented features */ /* Unimplemented features */
@ -1724,7 +1721,7 @@ int remove_mirror_log(struct cmd_context *cmd,
} }
/* Had disk log, switch to core. */ /* Had disk log, switch to core. */
if (lv_info(cmd, lv, 0, &info, 0, 0) && info.exists) { if (lv_is_active(lv)) {
if (!lv_mirror_percent(cmd, lv, 0, &sync_percent, if (!lv_mirror_percent(cmd, lv, 0, &sync_percent,
NULL)) { NULL)) {
log_error("Unable to determine mirror sync status."); log_error("Unable to determine mirror sync status.");

3
lib/report/report.c
View File

@ -830,7 +830,6 @@ static int _snpercent_disp(struct dm_report *rh __attribute__((unused)), struct
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lvinfo info;
percent_t snap_percent; percent_t snap_percent;
uint64_t *sortval; uint64_t *sortval;
char *repstr; char *repstr;
@ -847,7 +846,7 @@ static int _snpercent_disp(struct dm_report *rh __attribute__((unused)), struct
} }
if ((!lv_is_cow(lv) && !lv_is_merging_origin(lv)) || if ((!lv_is_cow(lv) && !lv_is_merging_origin(lv)) ||
!lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) || !info.exists) { !lv_is_active(lv)) {
*sortval = UINT64_C(0); *sortval = UINT64_C(0);
dm_report_field_set_value(field, "", sortval); dm_report_field_set_value(field, "", sortval);
return 1; return 1;