← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceph/trusty-updates

« back to all changes in this revision

Viewing changes to src/osdc/ObjectCacher.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-04-09 11:14:03 UTC
  • mfrom: (1.1.33)
  • Revision ID: package-import@ubuntu.com-20140409111403-jlql95pa8kg1nk9a
Tags: 0.79-0ubuntu1
https://launchpad.net/bugs/1278466
* New upstream release (LP: #1278466):
  - d/p/modules.patch: Refreshed.
  - d/ceph.install: Install all jerasure modules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osdc/ObjectCacher.cc
625
625
  ++reads_outstanding;
626
626
}
627
627
 
628
 
void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, tid_t tid,
 
628
void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid,
629
629
                                  loff_t start, uint64_t length,
630
630
                                  bufferlist &bl, int r,
631
631
                                  bool trust_enoent)
810
810
  C_WriteCommit *oncommit = new C_WriteCommit(this, bh->ob->oloc.pool,
811
811
                                              bh->ob->get_soid(), bh->start(), bh->length());
812
812
  // go
813
 
  tid_t tid = writeback_handler.write(bh->ob->get_oid(), bh->ob->get_oloc(),
 
813
  ceph_tid_t tid = writeback_handler.write(bh->ob->get_oid(), bh->ob->get_oloc(),
814
814
                                      bh->start(), bh->length(),
815
815
                                      bh->snapc, bh->bl, bh->last_write,
816
816
                                      bh->ob->truncate_size, bh->ob->truncate_seq,
830
830
}
831
831
 
832
832
void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid, loff_t start,
833
 
                                   uint64_t length, tid_t tid, int r)
 
833
                                   uint64_t length, ceph_tid_t tid, int r)
834
834
{
835
835
  assert(lock.is_locked());
836
836
  ldout(cct, 7) << "bh_write_commit " 
1245
1245
    ldout(cct, 10) << "readx  result is " << rd->bl->length() << dendl;
1246
1246
  } else {
1247
1247
    ldout(cct, 10) << "readx  no bufferlist ptr (readahead?), done." << dendl;
 
1248
    map<uint64_t,bufferlist>::reverse_iterator i = stripe_map.rbegin();
 
1249
    pos = i->first + i->second.length();
1248
1250
  }
1249
1251
 
1250
1252
  // done with read.