diff options
| author | David Teigland <teigland@redhat.com> | 2018-04-27 16:22:46 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2018-04-30 16:55:02 -0500 |
| commit | c1cd18f21ef233fa19e948cf130e97c005a349ad (patch) | |
| tree | dd257ff46f7214469c0f4bbca2c32cedc64387a0 /lib/report | |
| parent | 029a76b4f830750cc312c062d77cdaa4d1a1bba9 (diff) | |
| download | lvm2-c1cd18f21ef233fa19e948cf130e97c005a349ad.tar.gz | |
Remove lvm1 and pool disk formats
There are likely more bits of code that can be removed,
e.g. lvm1/pool-specific bits of code that were identified
using FMT flags.
The vgconvert command can likely be reduced further.
The lvm1-specific config settings should probably have
some other fields set for proper deprecation.
Diffstat (limited to 'lib/report')
| -rw-r--r-- | lib/report/report.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/report/report.c b/lib/report/report.c index 6d6289e09..01ab62722 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -2845,7 +2845,7 @@ static int _vgsystemid_disp(struct dm_report *rh, struct dm_pool *mem, const void *data, void *private) { const struct volume_group *vg = (const struct volume_group *) data; - const char *repstr = (vg->system_id && *vg->system_id) ? vg->system_id : vg->lvm1_system_id ? : ""; + const char *repstr = (vg->system_id && *vg->system_id) ? vg->system_id : ""; return _field_string(rh, field, repstr); } @@ -3822,7 +3822,6 @@ static struct volume_group _dummy_vg = { .fid = &_dummy_fid, .name = "", .system_id = (char *) "", - .lvm1_system_id = (char *) "", .pvs = DM_LIST_HEAD_INIT(_dummy_vg.pvs), .lvs = DM_LIST_HEAD_INIT(_dummy_vg.lvs), .historical_lvs = DM_LIST_HEAD_INIT(_dummy_vg.historical_lvs), @@ -3833,7 +3832,6 @@ static struct volume_group _unknown_vg = { .fid = &_dummy_fid, .name = "[unknown]", .system_id = (char *) "", - .lvm1_system_id = (char *) "", .pvs = DM_LIST_HEAD_INIT(_unknown_vg.pvs), .lvs = DM_LIST_HEAD_INIT(_unknown_vg.lvs), .historical_lvs = DM_LIST_HEAD_INIT(_unknown_vg.historical_lvs), |