From: Sage Weil <sage@redhat.com>
Date: Sat, 6 Feb 2016 01:02:34 +0000 (-0500)
Subject: Merge pull request #7460 from xiexingguo/xxg-wip-block
X-Git-Tag: v10.0.4~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6ff94c21a13e77185ff42235795cccbef1965b1;p=ceph.git

Merge pull request #7460 from xiexingguo/xxg-wip-block

osd: blockdevice: avoid implicit cast and add guard

Reviewed-by: Sage Weil <sage@redhat.com>
---

c6ff94c21a13e77185ff42235795cccbef1965b1
diff --cc src/os/bluestore/KernelDevice.cc
index 984be4c5ed74,9991ade9e4a3..b85b47393762
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@@ -476,8 -466,9 +482,9 @@@ int KernelDevice::read(uint64_t off, ui
      r = -errno;
      goto out;
    }
+   assert((uint64_t)r == len);
    pbl->clear();
 -  pbl->push_back(p);
 +  pbl->push_back(std::move(p));
  
    dout(40) << "data: ";
    pbl->hexdump(*_dout);