]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: re-take the osd lock in the init error path where it's not held
authorJosh Durgin <josh.durgin@dreamhost.com>
Mon, 6 Feb 2012 23:18:11 +0000 (15:18 -0800)
committerJosh Durgin <josh.durgin@dreamhost.com>
Mon, 6 Feb 2012 23:19:10 +0000 (15:19 -0800)
The Mutex::Locker will unlock it once the function exits.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/osd/OSD.cc

index 099a97eb097b87eef8c193d47fddf41b1edd10fd..98961cf98549a41a972c32cc13d2f41ce5c99647 100644 (file)
@@ -707,6 +707,7 @@ int OSD::init()
   if (r < 0) {
     monc->shutdown();
     store->umount();
+    osd_lock.Lock(); // locker is going to unlock this on function exit
     return r;
   }