From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 5 Oct 2010 18:05:07 +0000 (-0700)
Subject: Merge branch 'unstable' into osd_pglog_checksums
X-Git-Tag: v0.23~163^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e10f46075fafd13e9122c047b509abbc83c4d8ab;p=ceph.git

Merge branch 'unstable' into osd_pglog_checksums
---

e10f46075fafd13e9122c047b509abbc83c4d8ab
diff --cc src/osd/PG.cc
index d5bfc6cb8066,c05eed65cc69..bb91accc16b6
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -2033,11 -2026,10 +2031,11 @@@ void PG::write_log(ObjectStore::Transac
      */
    }
    ondisklog.head = bl.length();
 -  
 +  ondisklog.has_checksums = true;
 +
    // write it
-   t.remove(meta_coll, log_oid );
-   t.write(meta_coll, log_oid , 0, bl.length(), bl);
+   t.remove(coll_t::META_COLL, log_oid );
+   t.write(coll_t::META_COLL, log_oid , 0, bl.length(), bl);
  
    bufferlist blb(sizeof(ondisklog));
    ::encode(ondisklog, blb);