thin: correct ptr test for thin snapshot merging

The correct test needs to actually check  'lv->snapshot' is not NULL,
so the 'find_snapshot()' can work.

Test lv_is_snapshot was actually irrelavant for this case.

Also initialize device_id.

diff --git a/tools/lvconvert_poll.c b/tools/lvconvert_poll.c
index 0eae74616bdaa5df7429ed56fd782383db1e1312..5adb14506182d6926b67ad6a558f7735766610a0 100644 (file)
--- a/tools/lvconvert_poll.c
+++ b/tools/lvconvert_poll.c
@@ -174,9 +174,9 @@ progress_t poll_thin_merge_progress(struct cmd_context *cmd,
                                    const char *name __attribute__((unused)),
                                    struct daemon_parms *parms)
 {
-       uint32_t device_id;
+       uint32_t device_id = 0;
 
-       if (!lv_thin_device_id(lv, &device_id) && !lv_is_snapshot(lv)) {
+       if (!lv_thin_device_id(lv, &device_id) || !lv->snapshot) {
                stack;
                return PROGRESS_CHECK_FAILED;
        }