From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 31 Aug 2015 04:11:09 +0000 (+0800)
Subject: Merge pull request #5024 from xinxinsh/wip-12018
X-Git-Tag: v9.1.0~261
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8f33bcaa6111aa1bab1f8246b7d516a60ab23a8;p=ceph.git

Merge pull request #5024 from xinxinsh/wip-12018

make rbd and pool quota work

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

f8f33bcaa6111aa1bab1f8246b7d516a60ab23a8
diff --cc src/osd/OSD.cc
index f58da99f4a3da,fb9f8a7d99021..5bf29f5bc296e
--- a/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;