From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Sat, 1 Mar 2014 10:53:09 +0000 (+0100)
Subject: FileStore: fix resource leak in queue_transactions() blackhole case
X-Git-Tag: v0.78~108^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=249e21079257fafe06d80c541f52751e8bf942b2;p=ceph.git

FileStore: fix resource leak in queue_transactions() blackhole case

CID 1135931 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable "ondisk" going out of scope leaks the storage it
 points to.

CID 1135932 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable "onreadable" going out of scope leaks the storage
 it points to.

CID 1135933 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable "onreadable_sync" going out of scope leaks the
 storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 376c39776db7d..cef1d187c61dc 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1736,6 +1736,9 @@ int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
     tls, &onreadable, &ondisk, &onreadable_sync);
   if (g_conf->filestore_blackhole) {
     dout(0) << "queue_transactions filestore_blackhole = TRUE, dropping transaction" << dendl;
+    delete ondisk;
+    delete onreadable;
+    delete onreadable_sync;
     return 0;
   }