From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 21 Jan 2016 14:42:06 +0000 (-0500)
Subject: os: move Transaction ctors closer to member variables
X-Git-Tag: v10.0.4~177^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78cfe67449d3b4f5ba9b7bf50d4928c0851941e2;p=ceph.git

os: move Transaction ctors closer to member variables

this makes it easier to update constructors when adding/removing fields

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index ba9dd76e97ae..127d8c0c7eed 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -463,6 +463,28 @@ public:
     list<Context *> on_applied_sync;
 
   public:
+    Transaction() :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) { }
+
+    Transaction(bufferlist::iterator &dp) :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) {
+      decode(dp);
+    }
+
+    Transaction(bufferlist &nbl) :
+      osr(NULL),
+      use_tbl(false),
+      coll_id(0),
+      object_id(0) {
+      bufferlist::iterator dp = nbl.begin();
+      decode(dp);
+    }
 
     /* Operations on callback contexts */
     void register_on_applied(Context *c) {
@@ -1588,30 +1610,6 @@ public:
       data.ops++;
     }
 
-    // etc.
-    Transaction() :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) { }
-
-    Transaction(bufferlist::iterator &dp) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
-      decode(dp);
-    }
-
-    Transaction(bufferlist &nbl) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
-      bufferlist::iterator dp = nbl.begin();
-      decode(dp);
-    }
-
     void encode(bufferlist& bl) const {
       if (use_tbl) {
         uint64_t ops = data.ops;