From 7ef5eb06ec07d4e7c3fee4d85de8a8310f7ed94f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 3 Oct 2013 11:49:33 -0700 Subject: [PATCH] librados: drop reference to completion in container destructor Move the PoolAsyncCompletionImpl reference drop from C_PoolAsync_Safe::finish() to ~C_PoolAsyncSafe(), as finish() is only called when the async request is actually sent. Signed-off-by: Yehuda Sadeh Reviewed-by: Josh Durgin --- src/librados/PoolAsyncCompletionImpl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librados/PoolAsyncCompletionImpl.h b/src/librados/PoolAsyncCompletionImpl.h index efb89641466..443b2c23a17 100644 --- a/src/librados/PoolAsyncCompletionImpl.h +++ b/src/librados/PoolAsyncCompletionImpl.h @@ -94,6 +94,9 @@ namespace librados { C_PoolAsync_Safe(PoolAsyncCompletionImpl *_c) : c(_c) { c->get(); } + ~C_PoolAsync_Safe() { + c->put(); + } void finish(int r) { c->lock.Lock(); @@ -109,7 +112,7 @@ namespace librados { c->lock.Lock(); } - c->put_unlock(); + c->lock.Unlock(); } }; } -- 2.47.3