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

Indicate full (dropped) snapshot.

Browse Source
This commit is contained in:
Alasdair Kergon 2003-01-21 18:50:50 +00:00
parent a421f74371
commit 79be52c881
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/report/report.c
View File

@ -165,6 +165,8 @@ static int _lvstatus_disp(struct report_handle *rh, struct field *field,
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lvinfo info; struct lvinfo info;
char *repstr; char *repstr;
struct snapshot *snap;
float snap_percent;
if (!(repstr = pool_zalloc(rh->mem, 7))) { if (!(repstr = pool_zalloc(rh->mem, 7))) {
log_error("pool_alloc failed"); log_error("pool_alloc failed");
@ -202,6 +204,13 @@ static int _lvstatus_disp(struct report_handle *rh, struct field *field,
repstr[5] = 'o'; /* Open */ repstr[5] = 'o'; /* Open */
else else
repstr[5] = '-'; repstr[5] = '-';
/* Snapshot dropped? */
if ((snap = find_cow(lv)) &&
(!lv_snapshot_percent(snap->cow, &snap_percent) ||
snap_percent < 0))
repstr[0] = toupper(repstr[0]);
} else { } else {
repstr[4] = '-'; repstr[4] = '-';
repstr[5] = '-'; repstr[5] = '-';
@ -555,14 +564,20 @@ static int _snpercent_disp(struct report_handle *rh, struct field *field,
return 0; return 0;
} }
if (!(snap = find_cow(lv)) if (!(snap = find_cow(lv))) {
|| !lv_snapshot_percent(snap->cow, &snap_percent)) {
field->report_string = ""; field->report_string = "";
*sortval = __UINT64_C(0); *sortval = __UINT64_C(0);
field->sort_value = sortval; field->sort_value = sortval;
return 1; return 1;
} }
if (!lv_snapshot_percent(snap->cow, &snap_percent) || snap_percent < 0) {
field->report_string = "100.00";
*sortval = __UINT64_C(100);
field->sort_value = sortval;
return 1;
}
if (!(repstr = pool_zalloc(rh->mem, 8))) { if (!(repstr = pool_zalloc(rh->mem, 8))) {
log_error("pool_alloc failed"); log_error("pool_alloc failed");
return 0; return 0;
@ -744,7 +759,8 @@ static int _parse_options(struct report_handle *rh, const char *format)
while (*we && *we != ',') while (*we && *we != ',')
we++; we++;
if (!_field_match(rh, ws, (size_t) (we - ws))) { if (!_field_match(rh, ws, (size_t) (we - ws))) {
log_error("Unrecognised field: %.*s", (int) (we - ws), ws); log_error("Unrecognised field: %.*s", (int) (we - ws),
ws);
return 0; return 0;
} }
} }
@ -765,7 +781,8 @@ static int _parse_keys(struct report_handle *rh, const char *keys)
while (*we && *we != ',') while (*we && *we != ',')
we++; we++;
if (!_key_match(rh, ws, (size_t) (we - ws))) { if (!_key_match(rh, ws, (size_t) (we - ws))) {
log_error("Unrecognised field: %.*s", (int) (we - ws), ws); log_error("Unrecognised field: %.*s", (int) (we - ws),
ws);
return 0; return 0;
} }
} }