From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Feb 2014 19:59:16 +0000 (-0800)
Subject: OSDMap: make calc_pg_rank/role const for acting
X-Git-Tag: v0.78~131^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b4cf1c09b5f503fd51bf167115869d5fe4a22da;p=ceph.git

OSDMap: make calc_pg_rank/role const for acting

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index bcde66257b55..2ca2351ac298 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1569,7 +1569,7 @@ void OSDMap::_pg_to_up_acting_osds(pg_t pg, vector<int> *up, int *up_primary,
     *acting_primary = _acting_primary;
 }
 
-int OSDMap::calc_pg_rank(int osd, vector<int>& acting, int nrep)
+int OSDMap::calc_pg_rank(int osd, const vector<int>& acting, int nrep)
 {
   if (!nrep)
     nrep = acting.size();
@@ -1579,7 +1579,7 @@ int OSDMap::calc_pg_rank(int osd, vector<int>& acting, int nrep)
   return -1;
 }
 
-int OSDMap::calc_pg_role(int osd, vector<int>& acting, int nrep)
+int OSDMap::calc_pg_role(int osd, const vector<int>& acting, int nrep)
 {
   if (!nrep)
     nrep = acting.size();
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 4c626cc437b4..c7098d981951 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -712,8 +712,8 @@ public:
 
 
   /* what replica # is a given osd? 0 primary, -1 for none. */
-  static int calc_pg_rank(int osd, vector<int>& acting, int nrep=0);
-  static int calc_pg_role(int osd, vector<int>& acting, int nrep=0);
+  static int calc_pg_rank(int osd, const vector<int>& acting, int nrep=0);
+  static int calc_pg_role(int osd, const vector<int>& acting, int nrep=0);
   
   /* rank is -1 (stray), 0 (primary), 1,2,3,... (replica) */
   int get_pg_acting_rank(pg_t pg, int osd) const {