diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-03-06 00:49:26 +0100 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-03-14 02:14:43 +0100 |
| commit | ce4432adc67dc2fc06dd21ea08e59d179496bcc6 (patch) | |
| tree | 60f0a914fb6252e2abad715a4d0fba5bd9e4f853 /src/os/HashIndex.cc | |
| parent | OSD: lock not needed in ~DeletingState() (diff) | |
| download | ceph-ce4432adc67dc2fc06dd21ea08e59d179496bcc6.tar.xz ceph-ce4432adc67dc2fc06dd21ea08e59d179496bcc6.zip | |
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>
Diffstat (limited to 'src/os/HashIndex.cc')
| -rw-r--r-- | src/os/HashIndex.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc index a1d369d8e50..b3902b056a5 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); |