From: Sage Weil <sage@redhat.com>
Date: Mon, 13 Jul 2015 15:57:32 +0000 (-0400)
Subject: os/HashIndex: drop unused lower_bound arg
X-Git-Tag: v9.1.0~346^2~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4128f136c80c97a999bbeff14d2b6ed705fe46c;p=ceph.git

os/HashIndex: drop unused lower_bound arg

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc
index e18695ca4285..6c451eb224db 100644
--- a/src/os/HashIndex.cc
+++ b/src/os/HashIndex.cc
@@ -761,7 +761,6 @@ uint32_t HashIndex::hash_prefix_to_hash(string prefix) {
 }
 
 int HashIndex::get_path_contents_by_hash(const vector<string> &path,
-					 const string *lower_bound,
 					 const ghobject_t *next_object,
 					 set<string> *hash_prefixes,
 					 set<pair<string, ghobject_t> > *objects) {
@@ -781,8 +780,6 @@ int HashIndex::get_path_contents_by_hash(const vector<string> &path,
        i != rev_objects.end();
        ++i) {
     string hash_prefix = get_path_str(i->second);
-    if (lower_bound && hash_prefix < *lower_bound)
-      continue;
     if (next_object && i->second < *next_object)
       continue;
     hash_prefixes->insert(hash_prefix);
@@ -795,8 +792,6 @@ int HashIndex::get_path_contents_by_hash(const vector<string> &path,
        i != subdirs.end();
        ++i) {
     string candidate = cur_prefix + *i;
-    if (lower_bound && candidate < lower_bound->substr(0, candidate.size()))
-      continue;
     if (next_object &&
         (next_object->is_max() ||
 	 candidate < get_path_str(*next_object).substr(0, candidate.size())))
@@ -817,7 +812,6 @@ int HashIndex::list_by_hash(const vector<string> &path,
   set<string> hash_prefixes;
   set<pair<string, ghobject_t> > objects;
   int r = get_path_contents_by_hash(path,
-				    NULL,
 				    next,
 				    &hash_prefixes,
 				    &objects);
diff --git a/src/os/HashIndex.h b/src/os/HashIndex.h
index 7c52ca5f30cd..ee3de278006c 100644
--- a/src/os/HashIndex.h
+++ b/src/os/HashIndex.h
@@ -352,7 +352,6 @@ private:
   /// Get path contents by hash
   int get_path_contents_by_hash(
     const vector<string> &path,            /// [in] Path to list
-    const string *lower_bound,             /// [in] list > *lower_bound
     const ghobject_t *next_object,          /// [in] list > *next_object
     set<string> *hash_prefixes,            /// [out] prefixes in dir
     set<pair<string, ghobject_t> > *objects /// [out] objects