From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Sep 2017 22:13:19 +0000 (-0400)
Subject: osd/PG: protect get_role()
X-Git-Tag: v13.0.1~634^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4a9fdf8cd9acf96dc90a45d3bc6387f7bf1c618;p=ceph.git

osd/PG: protect get_role()

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 3d5bb81c52d..a541dc42c6e 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -325,9 +325,6 @@ public:
   bool is_deleting() const {
     return deleting;
   }
-  int get_role() const {
-    return role;
-  }
   bool is_replica() const {
     return role > 0;
   }
@@ -2450,7 +2447,12 @@ protected:
   }
   pg_shard_t get_primary() const { return primary; }
 
-  void       set_role(int r) { role = r; }
+  int get_role() const {
+    return role;
+  }
+  void set_role(int r) {
+    role = r;
+  }
 
   bool state_test(int m) const { return (state & m) != 0; }
   void state_set(int m) { state |= m; }