From 9e5694a54d679c6ec57265ee0cf825d95628e409 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 13 Sep 2016 19:07:56 +0530 Subject: [PATCH] Revert "osdc: After write try merge bh." This reverts commit 1a48a8a2b222e41236341cb1241f0885a1b0b9d8. Fixes: http://tracker.ceph.com/issues/17270 Signed-off-by: John Spray (cherry picked from commit 88dbde2fa7ce89ab58724833d436c563ba325682) --- src/osdc/ObjectCacher.cc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 2a1e76e36ca01..1bdbe742642c9 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -1039,7 +1039,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, } } - list hit; // apply to bh's! for (map::iterator p = ob->data_lower_bound(start); p != ob->data.end(); @@ -1074,7 +1073,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, bh->set_journal_tid(0); if (bh->get_nocache()) bh_lru_rest.lru_bottouch(bh); - hit.push_back(bh); ldout(cct, 10) << "bh_write_commit clean " << *bh << dendl; } else { mark_dirty(bh); @@ -1083,13 +1081,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, << dendl; } } - - for (list::iterator bh = hit.begin(); - bh != hit.end(); - ++bh) { - assert(*bh); - ob->try_merge_bh(*bh); - } } // update last_commit. -- 2.39.5