Merge pull request #13453 from xiaoxichen/drop_mallinfo

common/MemoryModel: Bump int to long and drop mallinfo

Reviewed-by: John Spray <john.spray@redhat.com>

diff --cc src/mds/MDCache.cc
index f80fec6c5613c903ecea01a10b3f7e91fe7588e9,e360f5394dca68af11b7bb96552e9000735752e8..1d6107cebaaac8fe02c7d3732d97797ef08152dc
--- 1/src/mds/MDCache.cc
--- 2/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -7360,11 -7377,10 +7360,10 @@@ void MDCache::check_memory_usage(
           << " total " << last.get_total()
           << ", rss " << last.get_rss()
           << ", heap " << last.get_heap()
-          << ", malloc " << last.malloc << " mmap " << last.mmap
           << ", baseline " << baseline.get_heap()
           << ", buffers " << (buffer::get_total_alloc() >> 10)
 -         << ", " << num_inodes_with_caps << " / " << inode_map.size() << " inodes have caps"
 -         << ", " << num_caps << " caps, " << caps_per_inode << " caps per inode"
 +         << ", " << num_inodes_with_caps << " / " << CInode::count() << " inodes have caps"
 +         << ", " << Capability::count() << " caps, " << caps_per_inode << " caps per inode"
           << dendl;
  
    mds->mlogger->set(l_mdm_rss, last.get_rss());

diff --cc src/mds/MDSRank.cc
Simple merge

diff --cc src/mds/MDSRank.h
Simple merge