From: Sage Weil <sage@redhat.com>
Date: Mon, 29 May 2017 01:21:20 +0000 (-0400)
Subject: os/bluestore: mark buffer caches buffers as bluestore_data
X-Git-Tag: ses5-milestone6~9^2~44^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23a186c7a82c8f2d64e9701418475c753569cfe7;p=ceph.git

os/bluestore: mark buffer caches buffers as bluestore_data

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

diff --git a/src/include/mempool.h b/src/include/mempool.h
index e75fedd2a125..4a64faffbac0 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -137,10 +137,11 @@ namespace mempool {
 
 #define DEFINE_MEMORY_POOLS_HELPER(f) \
   f(bloom_filter)		      \
-  f(bluestore_meta_onode)	      \
-  f(bluestore_meta_other)	      \
   f(bluestore_alloc)		      \
+  f(bluestore_data)		      \
   f(bluestore_fsck)		      \
+  f(bluestore_meta_onode)	      \
+  f(bluestore_meta_other)	      \
   f(bluefs)			      \
   f(buffer_anon)		      \
   f(buffer_meta)		      \
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index a9db4e509a50..cc096450c7ed 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -265,6 +265,7 @@ public:
       } else {
 	cache->_add_buffer(b, level, near);
       }
+      b->data.reassign_to_mempool(mempool::mempool_bluestore_data);
       cache->_audit("_add_buffer end");
     }
     void _rm_buffer(Cache* cache, Buffer *b) {