diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-11-05 10:22:31 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-11-07 21:26:11 +0100 |
| commit | f7f2f77dcad0d23c84a1146de05217beeb3fbde5 (patch) | |
| tree | 6d8ad21a47c79f33b28f8a58b9506c479135993d | |
| parent | e2fce429cfccf974be93bc939eed6f111738659c (diff) | |
| download | lvm2-f7f2f77dcad0d23c84a1146de05217beeb3fbde5.tar.gz | |
cleanup: update messages in lvconvert
Use display_lvname and update thin snapshot merge error message.
| -rw-r--r-- | tools/lvconvert.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 438f34b9d..50c77d8e6 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2018,9 +2018,10 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd, } if (lv_is_external_origin(origin_from_cow(lv))) { - log_error("Cannot merge snapshot \"%s\" into " - "the read-only external origin \"%s\".", - lv->name, origin_from_cow(lv)->name); + log_error("Cannot merge snapshot %s into " + "the read-only external origin %s.", + display_lvname(lv), + display_lvname(origin_from_cow(lv))); return 0; } @@ -2029,8 +2030,8 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd, && info.exists && info.live_table && (!lv_snapshot_percent(lv, &snap_percent) || snap_percent == DM_PERCENT_INVALID)) { - log_error("Unable to merge invalidated snapshot LV \"%s\".", - lv->name); + log_error("Unable to merge invalidated snapshot LV %s.", + display_lvname(lv)); return 0; } @@ -2119,7 +2120,9 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd, /* Check if merge is possible */ if (lv_is_merging_origin(origin)) { - log_error("Snapshot %s is already merging into the origin.", + log_error("Cannot merge snapshot %s into the origin %s " + "with merging snapshot %s.", + display_lvname(lv), display_lvname(origin), display_lvname(find_snapshot(origin)->lv)); return 0; } |