From: athanatos <rexludorum@gmail.com>
Date: Thu, 26 Sep 2013 19:01:19 +0000 (-0700)
Subject: Merge pull request #631 from ceph/wip-5857-8
X-Git-Tag: v0.71~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97c56ef3ec3f3641cc6ee536842e21c1a70d1dfe;p=ceph.git

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

Wip 5857 8

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

97c56ef3ec3f3641cc6ee536842e21c1a70d1dfe
diff --cc src/os/FileStore.cc
index 5cd22e2b348,68a922bc1e0..343fb25c0e4
--- a/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)