Merge pull request #631 from ceph/wip-5857-8

Wip 5857 8

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/common/hobject.h
Simple merge

diff --cc src/os/FileStore.cc
index 5cd22e2b3488f7f1c81bb9d6df69656522d34391,68a922bc1e059014554c9bf08d4e4dc61584477f..343fb25c0e43b8a253809e982556e2b803936a0d
--- 1/src/os/FileStore.cc
--- 2/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@@ -4015,10 -3919,11 +4020,11 @@@ int FileStore::collection_list_range(co
    return 0;
  }
  
 -int FileStore::collection_list_partial(coll_t c, hobject_t start,
 +int FileStore::collection_list_partial(coll_t c, ghobject_t start,
                                       int min, int max, snapid_t seq,
 -                                     vector<hobject_t> *ls, hobject_t *next)
 +                                     vector<ghobject_t> *ls, ghobject_t *next)
  {
+   dout(10) << "collection_list_partial: " << c << dendl;
    Index index;
    int r = get_index(c, &index);
    if (r < 0)

diff --cc src/os/FileStore.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge