]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #9778 from ifed01/wip-bluestore-blob-reduce
authorSage Weil <sage@redhat.com>
Sat, 18 Jun 2016 16:48:22 +0000 (12:48 -0400)
committerGitHub <noreply@github.com>
Sat, 18 Jun 2016 16:48:22 +0000 (12:48 -0400)
os/bluestore: reduce bluestore blob

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/os/bluestore/bluestore_types.cc
src/os/bluestore/bluestore_types.h
src/test/objectstore/test_bluestore_types.cc

index 59116f8aa29432b5360f1400acead63bccfc56c1,dc90ff8c577a9ee449bc516955c647352b79ebde..26c208aae857de8d088a7b06ea5f1378cf7943f1
@@@ -5537,9 -5787,9 +5536,9 @@@ void BlueStore::_do_write_big
      bufferlist t;
      blp.copy(l, t);
      b->bc.write(txc->seq, 0, t, wctx->buffered ? 0 : Buffer::FLAG_NOCACHE);
-     wctx->write(b, 0, t);
+     wctx->write(b, l, 0, t);
      o->onode.punch_hole(offset, l, &wctx->lex_old);
 -    o->onode.extent_map[offset] = bluestore_lextent_t(b->id, 0, l, 0);
 +    o->onode.extent_map[offset] = bluestore_lextent_t(b->id, 0, l);
      b->blob.ref_map.get(0, l);
      txc->statfs_delta.stored() += l;
      dout(20) << __func__ << "  lex 0x" << std::hex << offset << std::dec << ": "
Simple merge
Simple merge
Simple merge