stable-2.02 - lvconvert_poll: ensure LV has snapshot type

stable-2.02 - lvconvert_poll: ensure LV has snapshot type

[Zdenek Kabelac]

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c6089b2d0472a6e212ad0838009f47d611ac1b2
Commit:        9c6089b2d0472a6e212ad0838009f47d611ac1b2
Parent:        a83e1536704c028b96b91b74fcf8e5809cdf0014
Author:        Wu Guanghao <wuguanghao3@huawei.com>
AuthorDate:    Fri Sep 11 17:41:01 2020 +0800
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Oct 16 17:07:58 2020 +0200

lvconvert_poll: ensure LV has snapshot type

LV may not be a snapshot type, the return value of find_snapshot(lv) may be NULL.
Here, we will call stack if LV is not a snapshot type.

Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
---
 tools/lvconvert_poll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lvconvert_poll.c b/tools/lvconvert_poll.c
index b9ec316e1..0eae74616 100644
--- a/tools/lvconvert_poll.c
+++ b/tools/lvconvert_poll.c
@@ -176,7 +176,7 @@ progress_t poll_thin_merge_progress(struct cmd_context *cmd,
 {
 	uint32_t device_id;
 
-	if (!lv_thin_device_id(lv, &device_id)) {
+	if (!lv_thin_device_id(lv, &device_id) && !lv_is_snapshot(lv)) {
 		stack;
 		return PROGRESS_CHECK_FAILED;
 	}