From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Feb 2014 20:00:06 +0000 (-0800)
Subject: Objecter: make is_pg_changed static and const for old/newacting
X-Git-Tag: v0.78~131^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93983c9590c8fd6634b0c81895bc0fc5871c356d;p=ceph.git

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 fb80f3c8525..155e7a0a438 100644
--- 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 2e7576878b7..0eeeaf04e3c 100644
--- 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,