]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd,mds: use map::merge() whenever appropriate 21310/head
authorKefu Chai <kchai@redhat.com>
Tue, 10 Apr 2018 06:07:17 +0000 (14:07 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 10 Apr 2018 12:27:40 +0000 (20:27 +0800)
commit6623fc26dbb77cb62e52dfc80e7f1c5d63f7daea
treed0a1872a1ece2d68c3727fecf3d7933afb756d03
parent9c5cb4ea620da4ef14345ebc8018f9ed008c4345
osd,mds: use map::merge() whenever appropriate

and use explicit std::move() when map::merge() is not available.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mds/OpenFileTable.cc
src/osd/OSD.cc