]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: _have_pg should return NULL if pg is not in map
authorSamuel Just <sam.just@inktank.com>
Mon, 14 May 2012 20:12:18 +0000 (13:12 -0700)
committerSage Weil <sage@inktank.com>
Thu, 7 Jun 2012 18:21:49 +0000 (11:21 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc

index 4bf394b8a272499793932ee654432ca1b8d36fd8..00f32154ba15db8100998130978602484b9084f4 100644 (file)
@@ -1236,7 +1236,8 @@ bool OSD::_have_pg(pg_t pgid)
 PG *OSD::_lookup_lock_pg(pg_t pgid)
 {
   assert(osd_lock.is_locked());
-  assert(pg_map.count(pgid));
+  if (!pg_map.count(pgid))
+    return NULL;
   PG *pg = pg_map[pgid];
   pg->lock();
   return pg;