From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 29 Jun 2020 14:36:39 +0000 (+0200)
Subject: Merge pull request #35729 from rzarzynski/wip-bl-deprecate-claim
X-Git-Tag: v16.1.0~1890
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cedf2bbd13daba6059c98046969f646b944042ae;p=ceph.git

Merge pull request #35729 from rzarzynski/wip-bl-deprecate-claim

common/bl, *: deprecate bufferlist::claim() and switch to rvalue-taking operator=()

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
---

cedf2bbd13daba6059c98046969f646b944042ae
diff --cc src/include/buffer.h
index 37afb0e638cc,d0bd279898f7..3d199082eb10
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@@ -1064,11 -1064,10 +1064,13 @@@ struct error_code
  
      void reserve(size_t prealloc);
  
-     void claim(list& bl);
+     [[deprecated("in favor of operator=(list&&)")]] void claim(list& bl) {
+       *this = std::move(bl);
+     }
      void claim_append(list& bl);
 +    void claim_append(list&& bl) {
 +      claim_append(bl);
 +    }
      // only for bl is bufferlist::page_aligned_appender
      void claim_append_piecewise(list& bl);
  
diff --cc src/messages/MLock.h
index dc3142d13d29,4471ab220378..1a252eac264b
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@@ -58,10 -58,10 +58,10 @@@ protected
      lock->get_parent()->set_object_info(object_info);
    }
    MLock(SimpleLock *lock, int ac, mds_rank_t as, ceph::buffer::list& bl) :
 -    SafeMessage{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
 +    MMDSOp{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
      action(ac), asker(as), lock_type(lock->get_type()) {
      lock->get_parent()->set_object_info(object_info);
-     lockdata.claim(bl);
+     lockdata = std::move(bl);
    }
    ~MLock() override {}