]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
objecter: fix leak of bufferlist from MPoolOpReply
authorJosh Durgin <josh.durgin@dreamhost.com>
Mon, 14 Mar 2011 23:54:55 +0000 (16:54 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Tue, 15 Mar 2011 00:11:41 +0000 (17:11 -0700)
bufferlist->claim already clears the source bufferlist,
but setting it to NULL prevented it from being destroyed.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/osdc/Objecter.cc

index d463825ec7e66abafcb402f3cd53d46fa364941d..11ccce04d7b45a5675e12cb0aacac4c927da339d 100644 (file)
@@ -1088,10 +1088,8 @@ void Objecter::handle_pool_op_reply(MPoolOpReply *m)
   if (pool_ops.count(tid)) {
     PoolOp *op = pool_ops[tid];
     dout(10) << "have request " << tid << " at " << op << " Op: " << ceph_pool_op_name(op->pool_op) << dendl;
-    if (op->blp) {
+    if (op->blp)
       op->blp->claim(*m->response_data);
-      m->response_data = NULL;
-    }
     if (m->version > last_seen_osdmap_version)
       last_seen_osdmap_version = m->version;
     if (m->replyCode == 0 && osdmap->get_epoch() < m->epoch) {