]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-3431' into next
authorSage Weil <sage@inktank.com>
Sat, 17 Nov 2012 05:26:30 +0000 (21:26 -0800)
committerSage Weil <sage@inktank.com>
Sat, 17 Nov 2012 05:26:30 +0000 (21:26 -0800)
1  2 
src/osdc/ObjectCacher.cc

index 12f6ccdbe528c51fcc083e026ce94cdfd31a2bfa,c8d2449e3c327e98ce89c9e7fd33287a9b1266cc..8edf3a55c4b007f34a70196c41c36bdb618a6dcc
@@@ -730,10 -683,7 +731,8 @@@ void ObjectCacher::bh_read_finish(int64
  
  void ObjectCacher::bh_write(BufferHead *bh)
  {
 +  assert(lock.is_locked());
    ldout(cct, 7) << "bh_write " << *bh << dendl;
-   bh->ob->get();
    
    // finishers
    C_WriteCommit *oncommit = new C_WriteCommit(this, bh->ob->oloc.pool,