From: Wei Jin <wjin.cn@gmail.com>
Date: Fri, 13 May 2016 12:47:58 +0000 (+0800)
Subject: osd: remove duplicate function
X-Git-Tag: ses5-milestone5~450^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b6ac3abfc7e03ff5ddffbc743b1c2fa0ecd2680;p=ceph.git

osd: remove duplicate function

function reset_riter is totally the same to reset_rollback_info_trimmed_to_riter.

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index e8f2a3ac49ef..d503e744f60d 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -978,7 +978,7 @@ void PGLog::read_log(ObjectStore *store, coll_t pg_coll,
     }
   }
   log.head = info.last_update;
-  log.reset_riter();
+  log.reset_rollback_info_trimmed_to_riter();
 
   // build missing
   if (info.last_complete < info.last_update) {
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 2ee52d60327f..d5c69a18cafe 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -228,13 +228,6 @@ struct PGLog : DoutPrefixProvider {
       }
     }
     
-    void reset_riter() {
-      rollback_info_trimmed_to_riter = log.rbegin();
-      while (rollback_info_trimmed_to_riter != log.rend() &&
-        rollback_info_trimmed_to_riter->version > rollback_info_trimmed_to)
-        ++rollback_info_trimmed_to_riter;
-    }
-
     void reset_rollback_info_trimmed_to_riter() {
       rollback_info_trimmed_to_riter = log.rbegin();
       while (rollback_info_trimmed_to_riter != log.rend() &&
@@ -266,7 +259,6 @@ struct PGLog : DoutPrefixProvider {
         }
       }
         
-      reset_riter();
       indexed_data = PGLOG_INDEXED_ALL;
       reset_rollback_info_trimmed_to_riter();
     }