Merge branch 'wip-12971' of git://github.com/jcsp/ceph

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
	src/osdc/Objecter.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osdc/Objecter.cc
index 716dbf463e54fecefb1897f979e37beab0d5679b,7c96739bfe0e9dad79c55ab80065e6c282782bae..534241892b831b9f86cc340bfd45043cd267d9f6
--- 1/src/osdc/Objecter.cc
--- 2/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -1019,8 -1019,8 +1019,8 @@@ void Objecter::handle_osd_map(MOSDMap *
    bool was_pausewr = osdmap->test_flag(CEPH_OSDMAP_PAUSEWR) || cluster_full || _osdmap_has_pool_full();
    map<int64_t, bool> pool_full_map;
    for (map<int64_t, pg_pool_t>::const_iterator it = osdmap->get_pools().begin();
 -       it != osdmap->get_pools().end(); it++)
 +       it != osdmap->get_pools().end(); ++it)
-     pool_full_map[it->first] = it->second.has_flag(pg_pool_t::FLAG_FULL);
+     pool_full_map[it->first] = _osdmap_pool_full(it->second);
  
    
    list<LingerOp*> need_resend_linger;
@@@ -2421,8 -2423,8 +2423,8 @@@ bool Objecter::_osdmap_pool_full(const 
  bool Objecter::_osdmap_has_pool_full() const
  {
    for (map<int64_t, pg_pool_t>::const_iterator it = osdmap->get_pools().begin();
 -       it != osdmap->get_pools().end(); it++) {
 +       it != osdmap->get_pools().end(); ++it) {
-     if (it->second.has_flag(pg_pool_t::FLAG_FULL))
+     if (_osdmap_pool_full(it->second))
        return true;
    }
    return false;
@@@ -2440,11 -2447,11 +2447,11 @@@ bool Objecter::_osdmap_full_flag() cons
  void Objecter::update_pool_full_map(map<int64_t, bool>& pool_full_map)
  {
    for (map<int64_t, pg_pool_t>::const_iterator it = osdmap->get_pools().begin();
 -       it != osdmap->get_pools().end(); it++) {
 +       it != osdmap->get_pools().end(); ++it) {
      if (pool_full_map.find(it->first) == pool_full_map.end()) {
-       pool_full_map[it->first] = it->second.has_flag(pg_pool_t::FLAG_FULL);
+       pool_full_map[it->first] = _osdmap_pool_full(it->second);
      } else {
-       pool_full_map[it->first] = it->second.has_flag(pg_pool_t::FLAG_FULL) || pool_full_map[it->first];
+       pool_full_map[it->first] = _osdmap_pool_full(it->second) || pool_full_map[it->first];
      }
    }
  }

diff --cc src/osdc/Objecter.h
Simple merge