From: Samuel Just <sam.just@inktank.com>
Date: Tue, 5 Mar 2013 23:49:26 +0000 (-0800)
Subject: HashIndex: _collection_list_partial must tolerate NULL next
X-Git-Tag: v0.60~78^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce4432adc67dc2fc06dd21ea08e59d179496bcc6;p=ceph.git

HashIndex: _collection_list_partial must tolerate NULL next

Backport: bobtail
Fixes: #4379
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc
index a1d369d8e509..b3902b056a55 100644
--- a/src/os/HashIndex.cc
+++ b/src/os/HashIndex.cc
@@ -328,6 +328,9 @@ int HashIndex::_collection_list_partial(const hobject_t &start,
 					vector<hobject_t> *ls,
 					hobject_t *next) {
   vector<string> path;
+  hobject_t _next;
+  if (!next)
+    next = &_next;
   *next = start;
   dout(20) << "_collection_list_partial " << start << " " << min_count << "-" << max_count << " ls.size " << ls->size() << dendl;
   return list_by_hash(path, min_count, max_count, seq, next, ls);