From: Samuel Just <sam.just@inktank.com>
Date: Thu, 28 Feb 2013 17:56:49 +0000 (-0800)
Subject: ObjectStore: move queue_transaction into ObjectStore
X-Git-Tag: v0.60~78^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7db2a5115b4b9627ec1928a7537ff0e8a4000164;p=ceph.git

ObjectStore: move queue_transaction into ObjectStore

This will simplify the SnapMapper implementation.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 535417eaa71b..cff138b97f46 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2007,13 +2007,6 @@ struct C_JournaledAhead : public Context {
   }
 };
 
-int FileStore::queue_transaction(Sequencer *osr, Transaction *t)
-{
-  list<Transaction*> tls;
-  tls.push_back(t);
-  return queue_transactions(osr, tls, new C_DeleteTransaction(t));
-}
-
 int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
 				  Context *onreadable, Context *ondisk,
 				  Context *onreadable_sync,
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 94c34c1fee17..144939a26679 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -314,7 +314,6 @@ public:
   }
   unsigned _do_transaction(Transaction& t, uint64_t op_seq, int trans_num);
 
-  int queue_transaction(Sequencer *osr, Transaction* t);
   int queue_transactions(Sequencer *osr, list<Transaction*>& tls,
 			 Context *onreadable, Context *ondisk=0,
 			 Context *onreadable_sync=0,
diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 2f3d73133949..a36a7fbb3c4b 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -659,8 +659,12 @@ public:
   }
   unsigned apply_transactions(Sequencer *osr, list<Transaction*>& tls, Context *ondisk=0);
 
-  virtual int queue_transaction(Sequencer *osr, Transaction* t) = 0;
-  virtual int queue_transaction(Sequencer *osr, Transaction *t, Context *onreadable, Context *ondisk=0,
+  int queue_transaction(Sequencer *osr, Transaction* t) {
+    list<Transaction *> tls;
+    tls.push_back(t);
+    return queue_transactions(osr, tls, new C_DeleteTransaction(t));
+  }
+  int queue_transaction(Sequencer *osr, Transaction *t, Context *onreadable, Context *ondisk=0,
 				Context *onreadable_sync=0,
 				TrackedOpRef op = TrackedOpRef()) {
     list<Transaction*> tls;