Skip to contentSkip to conversation

blockdev: fix bitmap clear undo

PATCH Applied John Snow 3 participants 3 messages Mar 15, 2017 – Mar 16, 2017

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 blockdev: fix bitmap clear undo

Only undo the action if we actually prepared the action.

Signed-off-by John Snow <[email protected]>
---
 blockdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
blockdev.c +3 -1
index f1f49bd..c5b2c2c 100644
@@ -2047,7 +2047,9 @@ static void block_dirty_bitmap_clear_abort(BlkActionState *common)
     BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
                                              common, common);
 
-    bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);
+    if (state->backup) {
+        bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);
+    }
 }
 
 static void block_dirty_bitmap_clear_commit(BlkActionState *common)
Signature · 1 line
2.9.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · John Snow

Only undo the action if we actually prepared the action.

Signed-off-by John Snow <[email protected]>
---
 blockdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by Eric Blake <[email protected]>
Quoted 17 lines
blockdev.c +3 -1
index f1f49bd..c5b2c2c 100644
@@ -2047,7 +2047,9 @@ static void block_dirty_bitmap_clear_abort(BlkActionState *common)
     BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
                                              common, common);
 
-    bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);
+    if (state->backup) {
+        bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);
+    }
 }
 
 static void block_dirty_bitmap_clear_commit(BlkActionState *common)
Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org