From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jan 2020 18:01:19 +0000 (-0600)
Subject: osdc/Objecter: inline pool full check
X-Git-Tag: v15.1.1~562^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74b2cd6d9d42d0a98db4a6c310c0963737d8468f;p=ceph-ci.git

osdc/Objecter: inline pool full check

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 7c791eaf655..f5d59b2d6b7 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2685,11 +2685,6 @@ bool Objecter::_osdmap_has_pool_full() const
   return false;
 }
 
-bool Objecter::_osdmap_pool_full(const pg_pool_t &p) const
-{
-  return p.has_flag(pg_pool_t::FLAG_FULL) && honor_pool_full;
-}
-
 /**
  * Wrapper around osdmap->test_flag for special handling of the FULL flag.
  */
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9bc1cee9278..e153ce5f17f 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1968,6 +1968,7 @@ public:
   bool osdmap_full_flag() const;
   bool osdmap_pool_full(const int64_t pool_id) const;
 
+
  private:
 
   /**
@@ -1977,7 +1978,9 @@ public:
    *         the global full flag is set, else false
    */
   bool _osdmap_pool_full(const int64_t pool_id) const;
-  bool _osdmap_pool_full(const pg_pool_t &p) const;
+  bool _osdmap_pool_full(const pg_pool_t &p) const {
+    return p.has_flag(pg_pool_t::FLAG_FULL) && honor_pool_full;
+  }
   void update_pool_full_map(std::map<int64_t, bool>& pool_full_map);
 
   std::map<uint64_t, LingerOp*> linger_ops;