shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

thin: reporting of thin volumes simplified

Browse Source 
Simplify reporting of percentage.
Allows easier support for more types.

Move testing of device availability into activate.c
This commit is contained in:
Zdenek Kabelac 2014-11-03 12:38:24 +01:00
parent 897b091579
commit 7f35d42a99
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/activate/activate.c
View File

@ -1134,7 +1134,7 @@ int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
int r; int r;
struct dev_manager *dm; struct dev_manager *dm;
if (!activation()) if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
return 0; return 0;
log_debug_activation("Checking thin %sdata percent for LV %s/%s", log_debug_activation("Checking thin %sdata percent for LV %s/%s",
@ -1160,7 +1160,7 @@ int lv_thin_percent(const struct logical_volume *lv,
int r; int r;
struct dev_manager *dm; struct dev_manager *dm;
if (!activation()) if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
return 0; return 0;
log_debug_activation("Checking thin percent for LV %s/%s", log_debug_activation("Checking thin percent for LV %s/%s",
@ -1187,7 +1187,7 @@ int lv_thin_pool_transaction_id(const struct logical_volume *lv,
struct dev_manager *dm; struct dev_manager *dm;
struct dm_status_thin_pool *status; struct dm_status_thin_pool *status;
if (!activation()) if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
return 0; return 0;
log_debug_activation("Checking thin percent for LV %s/%s", log_debug_activation("Checking thin percent for LV %s/%s",
@ -1211,7 +1211,7 @@ int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id)
int r; int r;
struct dev_manager *dm; struct dev_manager *dm;
if (!activation()) if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
return 0; return 0;
log_debug_activation("Checking device id for LV %s/%s", log_debug_activation("Checking device id for LV %s/%s",

38
lib/report/report.c
View File

@ -1143,30 +1143,6 @@ static int _raidmaxrecoveryrate_disp(struct dm_report *rh __attribute__((unused)
return _field_set_value(field, "", &RESERVED(number_undef_64)); return _field_set_value(field, "", &RESERVED(number_undef_64));
} }
/* Called only with lv_is_thin_pool/volume */
static int _dtpercent_disp(int metadata, struct dm_report *rh,
struct dm_report_field *field,
const void *data, void *private)
{
const struct logical_volume *lv = (const struct logical_volume *) data;
dm_percent_t percent = DM_PERCENT_INVALID;
/* Suppress data percent if not using driver */
/* cannot use lv_is_active_locally - need to check for layer -tpool */
if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
return dm_report_field_percent(rh, field, &percent);
if (lv_is_thin_pool(lv)) {
if (!lv_thin_pool_percent(lv, metadata, &percent))
return_0;
} else { /* thin_volume */
if (!lv_thin_percent(lv, 0, &percent))
return_0;
}
return dm_report_field_percent(rh, field, &percent);
}
static int _datapercent_disp(struct dm_report *rh, struct dm_pool *mem, static int _datapercent_disp(struct dm_report *rh, struct dm_pool *mem,
struct dm_report_field *field, struct dm_report_field *field,
const void *data, void *private) const void *data, void *private)
@ -1176,9 +1152,10 @@ static int _datapercent_disp(struct dm_report *rh, struct dm_pool *mem,
if (lv_is_cow(lv)) if (lv_is_cow(lv))
return _snpercent_disp(rh, mem, field, data, private); return _snpercent_disp(rh, mem, field, data, private);
else if (lv_is_thin_pool(lv))
if (lv_is_thin_pool(lv) || lv_is_thin_volume(lv)) (void) lv_thin_pool_percent(lv, 0, &percent);
return _dtpercent_disp(0, rh, field, data, private); else if (lv_is_thin_volume(lv))
(void) lv_thin_percent(lv, 0, &percent);
return dm_report_field_percent(rh, field, &percent); return dm_report_field_percent(rh, field, &percent);
} }
@ -1189,11 +1166,14 @@ static int _metadatapercent_disp(struct dm_report *rh,
const void *data, void *private) const void *data, void *private)
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
dm_percent_t percent = DM_PERCENT_INVALID;
if (lv_is_thin_pool(lv)) if (lv_is_thin_pool(lv))
return _dtpercent_disp(1, rh, field, data, private); (void) lv_thin_pool_percent(lv, 1, &percent);
else if (lv_is_thin_volume(lv))
(void) lv_thin_percent(lv, 1, &percent);
return _field_set_value(field, "", &RESERVED(number_undef_64)); return dm_report_field_percent(rh, field, &percent);
} }
static int _lvmetadatasize_disp(struct dm_report *rh, struct dm_pool *mem, static int _lvmetadatasize_disp(struct dm_report *rh, struct dm_pool *mem,