From: David Zafman <dzafman@redhat.com>
Date: Wed, 3 Aug 2016 06:26:41 +0000 (-0700)
Subject: filestore: Clear objects before calling collection_list() again
X-Git-Tag: v10.2.3~94^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb1f17f05422ac802378df0de698ce20a1f2976e;p=ceph.git

filestore: Clear objects before calling collection_list() again

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 892303cd02b64b622669183c2acffcdd7a8f3547)
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 9dc124bf006..9e183a6f6e4 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -4619,6 +4619,7 @@ int FileStore::_collection_remove_recursive(const coll_t &cid,
       if (r < 0)
 	return r;
     }
+    objects.clear();
   }
   return _destroy_collection(cid);
 }