Merge pull request #11898 from liewegas/wip-filestore-hashindex

os/filestore/HashIndex: fix list_by_hash_* termination on reaching end Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · Nov 12, 2016 · 2eaa9fa · 2eaa9fa
2 parents 47a41cc + c518026
commit 2eaa9fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/os/filestore/HashIndex.cc b/src/os/filestore/HashIndex.cc
@@ -1065,7 +1065,7 @@ int HashIndex::list_by_hash_bitwise(
 	}
 	if (cmp_bitwise(j->second, end) >= 0) {
 	  if (next)
-	    *next = ghobject_t::get_max();
+	    *next = j->second;
 	  return 0;
 	}
 	if (!next || cmp_bitwise(j->second, *next) >= 0) {
@@ -1131,7 +1131,7 @@ int HashIndex::list_by_hash_nibblewise(
 	}
 	if (cmp_nibblewise(j->second, end) >= 0) {
 	  if (next)
-	    *next = ghobject_t::get_max();
+	    *next = j->second;
 	  return 0;
 	}
 	if (!next || cmp_nibblewise(j->second, *next) >= 0) {