RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 06:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: fix lock inversion with ondisk_write_unlock

Browse Source 
Drop write lock before taking pg lock.
This commit is contained in:
Sage Weil 2010-02-08 11:29:25 -08:00
parent ffb1b6c0b0
commit 408c81c210
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/ReplicatedPG.cc
View File

@ -1765,6 +1765,8 @@ void ReplicatedPG::apply_repop(RepGather *repop)
void ReplicatedPG::op_applied(RepGather *repop)
{
repop->obc->ondisk_write_unlock();
lock();
dout(10) << "op_applied " << *repop << dendl;
@ -1792,8 +1794,6 @@ void ReplicatedPG::op_applied(RepGather *repop)
mode.write_applied();
dout(10) << "op_applied mode now " << mode << " (finish_write)" << dendl;
repop->obc->ondisk_write_unlock();
put_object_context(repop->obc);
repop->obc = 0;
@ -2954,8 +2954,8 @@ void ReplicatedPG::_committed(epoch_t same_since, eversion_t last_complete)
void ReplicatedPG::_wrote_pushed_object(ObjectStore::Transaction *t, ObjectContext *obc)
{
dout(10) << "_wrote_pushed_object " << *obc << dendl;
lock();
obc->ondisk_write_unlock();
lock();
put_object_context(obc);
unlock();
delete t;