diff options
author | Radoslaw Zarzynski <rzarzyns@redhat.com> | 2020-06-23 12:28:15 +0200 |
---|---|---|
committer | Radoslaw Zarzynski <rzarzyns@redhat.com> | 2020-06-29 13:29:54 +0200 |
commit | 3fdfd606f1344317931207e3d3c123d62acb673b (patch) | |
tree | 44bfc8eb15db70d72ba9f6b0f3eb0d38e4321082 /src/mds/Migrator.cc | |
parent | Merge pull request #35635 from zdover23/wip-doc-man-deploy-mon-bootstrapping-... (diff) | |
download | ceph-3fdfd606f1344317931207e3d3c123d62acb673b.tar.xz ceph-3fdfd606f1344317931207e3d3c123d62acb673b.zip |
common/bl, *: deprecate list::claim() in favor of operator=(list&&).
The motivation is that `claim(list&)` seems to actually be a pre-C++11
counterpart of the already available `operator=(list&&)`.
This commit deprecates the `claim()` method but doesn't drop it yet.
All occurrences of `buffer::list::claim(list&)` are switched to
* `list::operator=(list&&)` or
* reworked to use `list::list(list&&)` instead.
Changes are applied to: rgw, osdc, osd, os/memstore, os/filestore,
os/bluestore, os, msg, mgr, messages, mds, librbd, librados, crimson,
common, cls, mon.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Diffstat (limited to 'src/mds/Migrator.cc')
-rw-r--r-- | src/mds/Migrator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 874e56416aa..ad99cf806b8 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -1303,7 +1303,7 @@ void Migrator::encode_export_prep_trace(bufferlist &final_bl, CDir *bound, cache->encode_replica_inode(cur->inode, es.peer, bl, mds->mdsmap->get_up_features()); dout(7) << " added " << *cur->inode << dendl; bl.claim_append(tracebl); - tracebl.claim(bl); + tracebl = std::move(bl); cur = cur->get_parent_dir(); // don't repeat dirfrags @@ -1317,7 +1317,7 @@ void Migrator::encode_export_prep_trace(bufferlist &final_bl, CDir *bound, cache->encode_replica_dir(cur, es.peer, bl); dout(7) << " added " << *cur << dendl; bl.claim_append(tracebl); - tracebl.claim(bl); + tracebl = std::move(bl); start = 'f'; // start with dirfrag } dirfrag_t df = cur->dirfrag(); |