Revert "osdc: After write try merge bh."

This reverts commit 1a48a8a2b222e41236341cb1241f0885a1b0b9d8.

Fixes: http://tracker.ceph.com/issues/17270
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 88dbde2fa7ce89ab58724833d436c563ba325682)

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 2a1e76e36ca01af97dfb39eb918942cb8b50cbf4..1bdbe742642c926bc9b45b12480b56778a92bc59 100644 (file)
--- 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 <BufferHead*> hit;
     // apply to bh's!
     for (map<loff_t, BufferHead*>::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<BufferHead*>::iterator bh = hit.begin();
-       bh != hit.end();
-       ++bh) {
-      assert(*bh);
-      ob->try_merge_bh(*bh);
-    }
   }
 
   // update last_commit.