rbd: fix cleanup of GroupSnapRollback and Sparsify progress callbacks

Instead of removing a respective progress callback, DiffIterate extent callback is attempted to be removed. This leaks the progress callback and on top of that it's quite possible for DiffIterate to be disrupted as cbIndex is not a unique pointer but just an integer ID. Signed-off-by: Ilya Dryomov <[email protected]>
ceph · Jan 29, 2025 · df352fd · df352fd
1 parent d284200
commit df352fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rbd/group_snap.go b/rbd/group_snap.go
@@ -217,7 +217,7 @@ func GroupSnapRollbackWithProgress(
 		data:     data,
 	}
 	cbIndex := groupSnapRollbackCallbacks.Add(ctx)
-	defer diffIterateCallbacks.Remove(cbIndex)
+	defer groupSnapRollbackCallbacks.Remove(cbIndex)
 
 	ret := C.wrap_rbd_group_snap_rollback_with_progress(
 		cephIoctx(ioctx),

diff --git a/rbd/sparsify.go b/rbd/sparsify.go
@@ -72,7 +72,7 @@ func (image *Image) SparsifyWithProgress(
 		data:     data,
 	}
 	cbIndex := sparsifyCallbacks.Add(ctx)
-	defer diffIterateCallbacks.Remove(cbIndex)
+	defer sparsifyCallbacks.Remove(cbIndex)
 
 	ret := C.wrap_rbd_sparsify_with_progress(image.image, C.size_t(sparseSize), C.uintptr_t(cbIndex))