]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/newstore: tolerate null pnext to collection_list()
authorSage Weil <sage@redhat.com>
Tue, 18 Aug 2015 19:08:55 +0000 (15:08 -0400)
committerSage Weil <sage@redhat.com>
Tue, 1 Sep 2015 17:39:43 +0000 (13:39 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/newstore/NewStore.cc

index a198d2ae103f2866e9ab46bf1f9c997b44ae27d6..a71302767a9c84906ed735b35521306cc919739d 100644 (file)
@@ -1574,6 +1574,10 @@ int NewStore::collection_list(
   const char *pend;
   bool temp;
 
+  ghobject_t static_next;
+  if (!pnext)
+    pnext = &static_next;
+
   if (start == ghobject_t::get_max())
     goto out;
   get_coll_key_range(cid, c->cnode.bits, &temp_start_key, &temp_end_key,