blkin: squash this commit ceph#4

Signed-off-by: Ali Maredia <amaredia@redhat.com>
alimaredia · May 24, 2016 · ab36ef5 · ab36ef5
1 parent 05aa546
commit ab36ef5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
@@ -1052,7 +1052,7 @@ int FileJournal::prepare_single_write(write_item &next_write, bufferlist& bl, of
   footerptr.copy_in(post_offset + magic2_offset, sizeof(uint64_t), (char *)&magic2);
 
   bl.claim_append(ebl);
-  if (next_write.tracked_op)
+  if (next_write.tracked_op) {
     next_write.tracked_op->mark_event("write_thread_in_journal_buffer");
     next_write.tracked_op->journal_trace.event("prepare_single_write");
   }

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
@@ -2171,12 +2171,8 @@ int FileStore::queue_transactions(Sequencer *posr, vector<Transaction>& tls,
   int r = do_transactions(tls, op);
 
   if (r >= 0) {
-<<<<<<< 22d1ff7fb6fea4e6add63f12545794f84488f002:src/os/filestore/FileStore.cc
-    _op_journal_transactions(tbl, orig_len, op, ondisk, osd_op);
-=======
     trace.event("journal started");
-    _op_journal_transactions(tbl, data_align, op, ondisk, osd_op);
->>>>>>> blkin: add traces to FileStore/Journal:src/os/FileStore.cc
+    _op_journal_transactions(tbl, orig_len, op, ondisk, osd_op);
   } else {
     delete ondisk;
   }