diff options
| author | Alasdair G Kergon <agk@redhat.com> | 2016-04-21 00:30:17 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2016-04-21 00:30:17 +0100 |
| commit | 0778d2e9857966e2d7e8f44c7f769fbdebb03a73 (patch) | |
| tree | 88613a4c6299fd8254bb148385541373f6c485af | |
| parent | 2763b928de9b79ed9e144950446e59c0cac36a03 (diff) | |
| download | lvm2-0778d2e9857966e2d7e8f44c7f769fbdebb03a73.tar.gz | |
display: Avoid internal snapshot LV names in msgs.
vg/snapshotN should not appear anywhere.
No code should be showing this, but it was noticed in some logs last
week and we can deal with it in display_lvname().
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/display/display.c | 14 | ||||
| -rw-r--r-- | lib/metadata/metadata-exported.h | 3 | ||||
| -rw-r--r-- | lib/metadata/snapshot_manip.c | 5 |
4 files changed, 21 insertions, 2 deletions
@@ -1,5 +1,6 @@ Version 2.02.151 - ================================= + Avoid internal snapshot LV names in messages. Autodetect and use /run/lock dir when available instead of /var/lock. lvchange --refresh for merging thin origin will retry to deactivate snapshot. Recognize in-progress snapshot merge for thin volumes from dm table. diff --git a/lib/display/display.c b/lib/display/display.c index a6387c622..0151d0137 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -121,19 +121,29 @@ const char *get_percent_string(percent_type_t def) return _percent_types[def]; } +static const char *_lv_name(const struct logical_volume *lv) +{ + /* Never try to display names of the internal snapshot structures. */ + if (lv_is_snapshot(lv)) + return find_cow(lv)->name; + + return lv->name; +} + const char *display_lvname(const struct logical_volume *lv) { char *name; + const char *lv_name = _lv_name(lv); int r; if ((lv->vg->cmd->display_lvname_idx + NAME_LEN) >= sizeof((lv->vg->cmd->display_buffer))) lv->vg->cmd->display_lvname_idx = 0; name = lv->vg->cmd->display_buffer + lv->vg->cmd->display_lvname_idx; - r = dm_snprintf(name, NAME_LEN, "%s/%s", lv->vg->name, lv->name); + r = dm_snprintf(name, NAME_LEN, "%s/%s", lv->vg->name, lv_name); if (r < 0) { - log_error("Full LV name \"%s/%s\" is too long.", lv->vg->name, lv->name); + log_error("Full LV name \"%s/%s\" is too long.", lv->vg->name, lv_name); return NULL; } diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index fb2ffa34a..039708edc 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -1082,6 +1082,9 @@ struct lv_segment *find_snapshot(const struct logical_volume *lv); /* Given a cow LV, return its origin */ struct logical_volume *origin_from_cow(const struct logical_volume *lv); +/* Given an internal snapshot LV, return its cow */ +struct logical_volume *find_cow(const struct logical_volume *snap); + void init_snapshot_seg(struct lv_segment *seg, struct logical_volume *origin, struct logical_volume *cow, uint32_t chunk_size, int merge); diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index d28d7c151..29b851f22 100644 --- a/lib/metadata/snapshot_manip.c +++ b/lib/metadata/snapshot_manip.c @@ -34,6 +34,11 @@ int lv_is_cow(const struct logical_volume *lv) return (!lv_is_thin_volume(lv) && !lv_is_origin(lv) && lv->snapshot) ? 1 : 0; } +struct logical_volume *find_cow(const struct logical_volume *snap) +{ + return first_seg(snap)->cow; +} + /* * Some kernels have a bug that they may leak space in the snapshot on crash. * If the kernel is buggy, we add some extra space. |