Objecter: make is_pg_changed static and const for old/newacting

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index fb80f3c85252580778f8f5164c32932f9d702b36..155e7a0a43852601d8a7378edc11a2db26d9919b 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1376,9 +1376,9 @@ int Objecter::op_cancel(tid_t tid, int r)
 
 bool Objecter::is_pg_changed(
   int oldprimary,
-  vector<int>& oldacting,
+  const vector<int>& oldacting,
   int newprimary,
-  vector<int>& newacting,
+  const vector<int>& newacting,
   bool any_change)
 {
   if (oldacting.empty() && newacting.empty())

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 2e7576878b723ce46f5d824b23c167bcad168fcb..0eeeaf04e3c5604680ff9f318d794dd61de584dc 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1432,11 +1432,11 @@ public:
   void send_op(Op *op);
   void cancel_linger_op(Op *op);
   void finish_op(Op *op);
-  bool is_pg_changed(
+  static bool is_pg_changed(
     int oldprimary,
-    vector<int>& oldacting,
+    const vector<int>& oldacting,
     int newprimary,
-    vector<int>& newacting,
+    const vector<int>& newacting,
     bool any_change=false);
   enum recalc_op_target_result {
     RECALC_OP_TARGET_NO_ACTION = 0,