From: David Zafman <david.zafman@inktank.com>
Date: Thu, 30 Jan 2014 01:13:39 +0000 (-0800)
Subject: osd: Change be_scan_list() arg to const
X-Git-Tag: v0.78~237^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce1ea619f65f0fbe69f8eff77e7431958e4055a4;p=ceph.git

osd: Change be_scan_list() arg to const

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index 52b14908a62..a95c716559f 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -431,7 +431,7 @@
      Context *on_complete) = 0;
 
    virtual bool scrub_supported() { return false; }
-   virtual void be_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep,
+   virtual void be_scan_list(ScrubMap &map, const vector<hobject_t> &ls, bool deep,
      ThreadPool::TPHandle &handle) { assert(0); }
    virtual enum scrub_error_type be_compare_scrub_objects(
 				ScrubMap::object &auth,
diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 81f74c12d4b..16eef86d881 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -767,13 +767,13 @@ void ReplicatedBackend::sub_op_modify_reply(OpRequestRef op)
  * pg lock may or may not be held
  */
 void ReplicatedBackend::be_scan_list(
-  ScrubMap &map, vector<hobject_t> &ls, bool deep,
+  ScrubMap &map, const vector<hobject_t> &ls, bool deep,
   ThreadPool::TPHandle &handle)
 {
   dout(10) << "_scan_list scanning " << ls.size() << " objects"
            << (deep ? " deeply" : "") << dendl;
   int i = 0;
-  for (vector<hobject_t>::iterator p = ls.begin();
+  for (vector<hobject_t>::const_iterator p = ls.begin();
        p != ls.end();
        ++p, i++) {
     handle.reset_tp_timeout();
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 324607234b2..1c66c4aa586 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -490,7 +490,7 @@ private:
   void sub_op_modify_applied(RepModifyRef rm);
   void sub_op_modify_commit(RepModifyRef rm);
   bool scrub_supported() { return true; }
-  void be_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep,
+  void be_scan_list(ScrubMap &map, const vector<hobject_t> &ls, bool deep,
     ThreadPool::TPHandle &handle);
   enum scrub_error_type be_compare_scrub_objects(
 				ScrubMap::object &auth,