summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-01 17:14:53 +0100
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-01 17:14:53 +0100
commit79569f7d3b0fdd61cb8aef66bd598aa5c4e7fc8f (patch)
treedb0589fe05a814a7dd1ffe5cfc9cf5d9601415d7
parent75a265f2df7fdd2471e0edd7a6903da8e64ee41c (diff)
downloadceph-79569f7d3b0fdd61cb8aef66bd598aa5c4e7fc8f.tar.gz
osd/PG.cc: reduce scope of listed_collection in read_log_old()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
-rw-r--r--src/osd/PG.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7f9b4ba16b9..90e6c0fcd5d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5208,7 +5208,6 @@ void PG::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
// In case of sobject_t based encoding, may need to list objects in the store
// to find hashes
- bool listed_collection = false;
vector<hobject_t> ls;
if (ondisklog_head > 0) {
@@ -5228,6 +5227,8 @@ void PG::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
assert(log.empty());
eversion_t last;
bool reorder = false;
+ bool listed_collection = false;
+
while (!p.end()) {
uint64_t pos = ondisklog_tail + p.get_off();
if (ondisklog_has_checksums) {