]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix recursive lock on remove_list_lock
authorSage Weil <sage@newdream.net>
Tue, 4 Nov 2008 00:05:45 +0000 (16:05 -0800)
committerSage Weil <sage@newdream.net>
Tue, 4 Nov 2008 00:54:32 +0000 (16:54 -0800)
queue_for_removal() takes the lock inside the loop.

src/osd/PG.cc

index f703977d721edd5253611d741dee81650b0dcb2d..23f879ae1630dc46b5e289e0e49a3f203df1639b 100644 (file)
@@ -1204,7 +1204,6 @@ void PG::purge_strays()
 {
   dout(10) << "purge_strays " << stray_set << dendl;
   
-  osd->remove_list_lock.Lock();
   for (set<int>::iterator p = stray_set.begin();
        p != stray_set.end();
        p++) {
@@ -1216,7 +1215,6 @@ void PG::purge_strays()
     }
     peer_info.erase(*p);
   }
-  osd->remove_list_lock.Unlock();
 
   stray_set.clear();
 }