diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2016-01-13 17:11:00 +0100 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2016-01-13 17:11:05 +0100 |
| commit | 63d59254d95e29a4e6ca47cadfb15cf821ec7479 (patch) | |
| tree | 89e06153be580d9c649a36a0cd19571aa1d092f3 | |
| parent | 04d1a8a5e41bd9fbcaa885b0b13faba85db532d9 (diff) | |
| download | lvm2-63d59254d95e29a4e6ca47cadfb15cf821ec7479.tar.gz | |
lv: fix check for NULL origin_lv in _do_lv_origin_dup, cleanup _do_lvconvert_lv_dup
| -rw-r--r-- | lib/metadata/lv.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 96f6f5c2e..6575cc9f2 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -273,7 +273,7 @@ static char *_do_lv_origin_dup(struct dm_pool *mem, const struct logical_volume { struct logical_volume *origin_lv = lv_origin_lv(lv); - if (!lv) + if (!origin_lv) return NULL; if (uuid) @@ -533,14 +533,13 @@ static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_vol { struct logical_volume *convert_lv = lv_convert_lv(lv); - if (convert_lv) { - if (uuid) - return lv_uuid_dup(mem, convert_lv); - else - return lv_name_dup(mem, convert_lv); - } + if (!convert_lv) + return NULL; - return NULL; + if (uuid) + return lv_uuid_dup(mem, convert_lv); + else + return lv_name_dup(mem, convert_lv); } char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) |