]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #35729 from rzarzynski/wip-bl-deprecate-claim
authorIlya Dryomov <idryomov@gmail.com>
Mon, 29 Jun 2020 14:36:39 +0000 (16:36 +0200)
committerGitHub <noreply@github.com>
Mon, 29 Jun 2020 14:36:39 +0000 (16:36 +0200)
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>
1  2 
src/common/buffer.cc
src/include/buffer.h
src/mds/CDir.cc
src/mds/MDCache.cc
src/mds/Migrator.cc
src/mds/mdstypes.h
src/messages/MLock.h
src/messages/MMDSResolve.h
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/rgw/rgw_file.h

Simple merge
index 37afb0e638cc7f02efac424e2ea229601dd9123a,d0bd279898f7bab04d0cd3980ee9d2c7a0fb9aa5..3d199082eb10fd67ff4a3af165c44d455494910d
@@@ -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/mds/CDir.cc
Simple merge
Simple merge
Simple merge
Simple merge
index dc3142d13d29b32526a14cfcaf960e25b9a95523,4471ab220378259314c03570452359057387dc2c..1a252eac264b6c17868eb76be38f772dcf83ae44
@@@ -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 {}
    
Simple merge
Simple merge
Simple merge
Simple merge