filestore: rename _apply_transaction

Conflicts:

	src/os/FileStore.h

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index cc9a6958f9a20aaceeb0058712af520ebf3fab94..929ed1bbcac6460e640c86703e4f57d27cda90af 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -583,7 +583,7 @@ unsigned FileStore::apply_transactions(list<Transaction*> &tls,
     for (list<Transaction*>::iterator p = tls.begin();
         p != tls.end();
         p++) {
-      r = _apply_transaction(**p);
+      r = _do_transaction(**p);
       if (r < 0)
        break;
     }
@@ -663,9 +663,9 @@ void FileStore::_transaction_finish(int fd)
 #endif /* DARWIN */
 }
 
-unsigned FileStore::_apply_transaction(Transaction& t)
+unsigned FileStore::_do_transaction(Transaction& t)
 {
-  dout(10) << "_apply_transaction on " << &t << dendl;
+  dout(10) << "_do_transaction on " << &t << dendl;
 
   while (t.have_op()) {
     int op = t.get_op();

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index a74469598e3bd730fee9b7e0d94895d08c16d16f..f1a44f72d57cd13dc5fdda9c4027f8d5db8972f4 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -118,7 +118,7 @@ class FileStore : public JournalingObjectStore {
   unsigned apply_transactions(list<Transaction*>& tls, Context *onjournal=0, Context *ondisk=0);
   int _transaction_start(__u64 bytes, __u64 ops);
   void _transaction_finish(int id);
-  unsigned _apply_transaction(Transaction& t);
+  unsigned _do_transaction(Transaction& t);
   int _do_usertrans(list<Transaction*>& tls);
 
   // ------------------