]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: create buffer::ptr_node directly.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 23 Oct 2018 13:51:09 +0000 (15:51 +0200)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Sun, 2 Dec 2018 23:49:33 +0000 (00:49 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/client/Client.cc

index a1a0866c3472527e3194e4f24229b9748a902406..32cf5b0c2706a9ab64c16938609173695b8f0839 100644 (file)
@@ -9255,7 +9255,7 @@ int Client::_read_sync(Fh *f, uint64_t off, uint64_t len, bufferlist *bl,
        int64_t some = in->size - pos;
        if (some > left)
          some = left;
-       bufferptr z(some);
+       auto& z = buffer::ptr_node::create(some);
        z.zero();
        bl->push_back(z);
        read += some;
@@ -13174,10 +13174,10 @@ int Client::ll_write_block(Inode *in, uint64_t blockid,
   }
   object_t oid = file_object_t(vino.ino, blockid);
   SnapContext fakesnap;
-  bufferptr bp;
-  if (length > 0) bp = buffer::copy(buf, length);
-  bufferlist bl;
-  bl.push_back(bp);
+  ceph::bufferlist bl;
+  if (length > 0) {
+    bl.push_back(buffer::copy(buf, length));
+  }
 
   ldout(cct, 1) << "ll_block_write for " << vino.ino << "." << blockid
                << dendl;