]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #20527 into luminous
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 27 Mar 2018 22:55:57 +0000 (15:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 27 Mar 2018 22:55:57 +0000 (15:55 -0700)
* refs/pull/20527/head:
mds: various fixes for backport
mds: convert to boost::string_view
test/encoding: refactor to avoid escaping shell magic
mds: minor refactor of SimpleLock
mds: track Capability in mempool
mds: move CInode container members to mempool
mds: move CDentry container members to mempool
mds: move CDir container members to mempool
mds: put MDSCacheObject compact_map in mempool
common: use size_t for object size
mds: convert to allocator agnostic string_view
mds: simplify initialization
compact_*: support mempool allocated containers

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
13 files changed:
1  2 
qa/standalone/ceph-helpers.sh
src/client/Client.cc
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/CInode.h
src/mds/Locker.cc
src/mds/MDSDaemon.cc
src/mds/MDSDaemon.h
src/mds/MDSRank.cc
src/mds/MDSRank.h
src/mds/Server.cc
src/mds/Server.h
src/tools/cephfs/JournalTool.cc

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