Merge pull request #5024 from xinxinsh/wip-12018

make rbd and pool quota work

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/osd/OSD.cc
index f58da99f4a3dab077c89e0e9a5519f838b73409f,fb9f8a7d99021d9eab044519cc5d94f952cb113b..5bf29f5bc296e5c93bae1bd5a0390525f1fea970
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -6197,9 -6119,10 +6197,10 @@@ void OSD::handle_osd_map(MOSDMap *m
        o->decode(bl);
        if (o->test_flag(CEPH_OSDMAP_FULL))
        last_marked_full = e;
+       set_pool_last_map_marked_full(o, e);
  
 -      hobject_t fulloid = get_osdmap_pobject_name(e);
 -      t.write(META_COLL, fulloid, 0, bl.length(), bl);
 +      ghobject_t fulloid = get_osdmap_pobject_name(e);
 +      t.write(coll_t::meta(), fulloid, 0, bl.length(), bl);
        pin_map_bl(e, bl);
        pinned_maps.push_back(add_map(o));
        continue;

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

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

diff --cc src/osd/osd_types.h
Simple merge

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

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