From: Willem Jan Withagen <wjw@digiware.nl>
Date: Mon, 9 Apr 2018 22:04:24 +0000 (+0200)
Subject: osd: make *Force* functions public
X-Git-Tag: v13.1.0~275^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a139c1d6061eb3385beba0b272276036c80b2de4;p=ceph.git

osd: make *Force* functions public

Otherwise you'll have 'protected' errors:
home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8518:12: error: 'UnsetForceBackfill' is a protected member of 'PG'
              PG::UnsetForceBackfill())));
                  ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1902:16: note: declared protected here
  TrivialEvent(UnsetForceBackfill)
               ^
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8525:12: error: 'SetForceBackfill' is a protected member of 'PG'
              PG::SetForceBackfill())));
                  ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1901:16: note: declared protected here
  TrivialEvent(SetForceBackfill)
               ^
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8534:12: error: 'UnsetForceRecovery' is a protected member of 'PG'
              PG::UnsetForceRecovery())));
                  ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1900:16: note: declared protected here
  TrivialEvent(UnsetForceRecovery)
               ^
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8541:12: error: 'SetForceRecovery' is a protected member of 'PG'
              PG::SetForceRecovery())));
                  ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1899:16: note: declared protected here
  TrivialEvent(SetForceRecovery)
               ^
4 errors generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 788084512c5..5b9af60fab6 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1892,15 +1892,16 @@ protected:
   public:
   TrivialEvent(DeleteStart)
   TrivialEvent(DeleteSome)
-  protected:
-  TrivialEvent(DeleteReserved)
-  TrivialEvent(DeleteInterrupted)
 
   TrivialEvent(SetForceRecovery)
   TrivialEvent(UnsetForceRecovery)
   TrivialEvent(SetForceBackfill)
   TrivialEvent(UnsetForceBackfill)
 
+  protected:
+  TrivialEvent(DeleteReserved)
+  TrivialEvent(DeleteInterrupted)
+
   /* Encapsulates PG recovery process */
   class RecoveryState {
     void start_handle(RecoveryCtx *new_ctx);