From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Feb 2016 13:36:06 +0000 (-0500)
Subject: Merge branch 'xxg-wip-14474' of git://github.com/xiexingguo/ceph
X-Git-Tag: v10.0.4~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76e791412c04a1ca0e0e7a3159595822407c0aa6;p=ceph.git

Merge branch 'xxg-wip-14474' of git://github.com/xiexingguo/ceph

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

76e791412c04a1ca0e0e7a3159595822407c0aa6
diff --cc src/os/bluestore/BlueFS.cc
index 3c0b13cdabc3,64dd9f389734..e0c024e03a30
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@@ -887,8 -892,10 +890,9 @@@ void BlueFS::_pad_bl(bufferlist& bl
  {
    uint64_t partial = bl.length() % super.block_size;
    if (partial) {
-     dout(10) << __func__ << " padding with " << super.block_size - partial << " zeros" << dendl;
 -    bufferptr z(super.block_size - partial);
 -    dout(10) << __func__ << " padding with " << z.length() << " zeros" << dendl;
 -    z.zero();
 -    bl.append(z);
++    dout(10) << __func__ << " padding with " << super.block_size - partial
++	     << " zeros" << dendl;
 +    bl.append_zero(super.block_size - partial);
    }
  }