From 3fffc75d86c31d8dacd6a54cbbfc44e8b9f31d0a Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 5 Oct 2018 21:48:51 +0100 Subject: [PATCH] Fix brace merge issue --- primitives/blockcache/filebuffermgr.cpp | 2 ++ procmon/main.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/primitives/blockcache/filebuffermgr.cpp b/primitives/blockcache/filebuffermgr.cpp index 0d3032743..013ef7603 100644 --- a/primitives/blockcache/filebuffermgr.cpp +++ b/primitives/blockcache/filebuffermgr.cpp @@ -219,6 +219,8 @@ void FileBufferMgr::flushManyAllversion(const LBID_t* laVptr, uint32_t cnt) for (it = fbSet.begin(); it != fbSet.end();) { + if (uniquer.find(it->lbid) != uniquer.end()) + { if (fReportFrequency) { fLog << "flushManyAllversion hit: " << it->lbid << " index: " << it->poolIdx << endl; diff --git a/procmon/main.cpp b/procmon/main.cpp index 3e383ab10..4ff8500ce 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -224,7 +224,7 @@ int main(int argc, char** argv) } catch (...) {} - if ( cloud == "amazon-ec2" || cloud == "amazon-vpc" ) { + if ( cloud == "amazon-ec2" || cloud == "amazon-vpc" ) { if (!aMonitor.amazonIPCheck()) {