diff options
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/commands/toolcontext.c | 5 | ||||
| -rw-r--r-- | lib/freeseg/freeseg.c | 60 | ||||
| -rw-r--r-- | lib/metadata/segtype.h | 1 | ||||
| -rw-r--r-- | lib/report/report.c | 9 | ||||
| -rw-r--r-- | tools/reporter.c | 35 |
7 files changed, 109 insertions, 3 deletions
@@ -1,5 +1,6 @@ Version 2.02.39 - ================================ + Fix reporting of LV fields alongside unallocated PV segments. Add --unquoted and --rows to reporting tools. Add and use uninitialized_var() macro to suppress invalid compiler warnings. Introduce enum for md minor sb version to suppress compiler warning. diff --git a/lib/Makefile.in b/lib/Makefile.in index 98cc5b33..5514e55b 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -61,6 +61,7 @@ SOURCES =\ format_text/import_vsn1.c \ format_text/tags.c \ format_text/text_label.c \ + freeseg/freeseg.c \ label/label.c \ locking/file_locking.c \ locking/locking.c \ diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index aa064726..f3cd1310 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -755,6 +755,11 @@ static int _init_segtypes(struct cmd_context *cmd) segtype->library = NULL; list_add(&cmd->segtypes, &segtype->list); + if (!(segtype = init_free_segtype(cmd))) + return 0; + segtype->library = NULL; + list_add(&cmd->segtypes, &segtype->list); + #ifdef SNAPSHOT_INTERNAL if (!(segtype = init_snapshot_segtype(cmd))) return 0; diff --git a/lib/freeseg/freeseg.c b/lib/freeseg/freeseg.c new file mode 100644 index 00000000..08f31006 --- /dev/null +++ b/lib/freeseg/freeseg.c @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "lib.h" +#include "toolcontext.h" +#include "segtype.h" +#include "display.h" +#include "text_export.h" +#include "text_import.h" +#include "config.h" +#include "str_list.h" +#include "targets.h" +#include "lvm-string.h" +#include "activate.h" +#include "str_list.h" +#include "metadata.h" + +static const char *_freeseg_name(const struct lv_segment *seg) +{ + return seg->segtype->name; +} + +static void _freeseg_destroy(const struct segment_type *segtype) +{ + dm_free((void *)segtype); +} + +static struct segtype_handler _freeseg_ops = { + .name = _freeseg_name, + .destroy = _freeseg_destroy, +}; + +struct segment_type *init_free_segtype(struct cmd_context *cmd) +{ + struct segment_type *segtype = dm_malloc(sizeof(*segtype)); + + if (!segtype) + return_NULL; + + segtype->cmd = cmd; + segtype->ops = &_freeseg_ops; + segtype->name = "free"; + segtype->private = NULL; + segtype->flags = SEG_VIRTUAL | SEG_CANNOT_BE_ZEROED; + + log_very_verbose("Initialised segtype: %s", segtype->name); + + return segtype; +} diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h index 91542928..fa668dc1 100644 --- a/lib/metadata/segtype.h +++ b/lib/metadata/segtype.h @@ -95,6 +95,7 @@ struct segment_type *get_segtype_from_string(struct cmd_context *cmd, struct segment_type *init_striped_segtype(struct cmd_context *cmd); struct segment_type *init_zero_segtype(struct cmd_context *cmd); struct segment_type *init_error_segtype(struct cmd_context *cmd); +struct segment_type *init_free_segtype(struct cmd_context *cmd); #ifdef SNAPSHOT_INTERNAL struct segment_type *init_snapshot_segtype(struct cmd_context *cmd); diff --git a/lib/report/report.c b/lib/report/report.c index 8177a2ff..70e25aec 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -303,6 +303,10 @@ static int _lvstatus_disp(struct dm_report *rh __attribute((unused)), struct dm_ return 0; } + /* Blank if this is a "free space" LV. */ + if (!*lv->name) + goto out; + if (lv->status & PVMOVE) repstr[0] = 'p'; else if (lv->status & CONVERTING) @@ -332,8 +336,10 @@ static int _lvstatus_disp(struct dm_report *rh __attribute((unused)), struct dm_ repstr[1] = '-'; else if (lv->status & LVM_WRITE) repstr[1] = 'w'; - else + else if (lv->status & LVM_READ) repstr[1] = 'r'; + else + repstr[1] = '-'; repstr[2] = _alloc_policy_char(lv->alloc); @@ -375,6 +381,7 @@ static int _lvstatus_disp(struct dm_report *rh __attribute((unused)), struct dm_ repstr[5] = '-'; } +out: dm_report_field_set_value(field, repstr, NULL); return 1; } diff --git a/tools/reporter.c b/tools/reporter.c index 02b51e38..5c35a0cb 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -61,8 +61,39 @@ static int _pvsegs_sub_single(struct cmd_context *cmd __attribute((unused)), int ret = ECMD_PROCESSED; struct lv_segment *seg = pvseg->lvseg; - if (!report_object(handle, vg, seg ? seg->lv : NULL, pvseg->pv, seg, - pvseg)) + struct logical_volume _free_logical_volume = { + .vg = vg, + .name = (char *) "", + .snapshot = NULL, + .status = VISIBLE_LV, + .major = -1, + .minor = -1, + }; + + struct lv_segment _free_lv_segment = { + .lv = &_free_logical_volume, + .le = 0, + .status = 0, + .stripe_size = 0, + .area_count = 0, + .area_len = 0, + .origin = NULL, + .cow = NULL, + .chunk_size = 0, + .region_size = 0, + .extents_copied = 0, + .log_lv = NULL, + .areas = NULL, + }; + + _free_lv_segment.segtype = get_segtype_from_string(cmd, "free"); + _free_lv_segment.len = pvseg->len; + list_init(&_free_logical_volume.tags); + list_init(&_free_logical_volume.segments); + list_init(&_free_logical_volume.segs_using_this_lv); + + if (!report_object(handle, vg, seg ? seg->lv : &_free_logical_volume, pvseg->pv, + seg ? : &_free_lv_segment, pvseg)) ret = ECMD_FAILED; return ret; |