Skip to content

Commit

Permalink
Merge pull request #11382 from yuyuyu101/wip-fix-shadow
Browse files Browse the repository at this point in the history
osd/PGBackend: fix collection_list shadow return value

Reviewed-by: Kefu Chai <kchai@redhat.com>
tchaikov
  • Loading branch information
yuriw committed Oct 31, 2016
2 parents bf9df72 + 8a53a60 commit 98e5931
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/osd/PGBackend.cc
Expand Up @@ -140,16 +140,18 @@ int PGBackend::objects_list_partial(

while (!_next.is_max() && ls->size() < (unsigned)min) {
vector<ghobject_t> objects;
int r = store->collection_list(
r = store->collection_list(
ch,
_next,
ghobject_t::get_max(),
parent->sort_bitwise(),
max - ls->size(),
&objects,
&_next);
if (r != 0)
if (r != 0) {
derr << __func__ << " list collection " << ch << " got: " << cpp_strerror(r) << dendl;
break;
}
for (vector<ghobject_t>::iterator i = objects.begin();
i != objects.end();
++i) {
Expand Down

0 comments on commit 98e5931

Please sign in to comment.