From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Dec 2016 17:00:13 +0000 (-0500)
Subject: os/bluestore/bluestore_types: reorder onode_t types
X-Git-Tag: v12.0.0~351^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=284fd0bd604eb671e041962e7bf9050e4ac309d4;p=ceph.git

os/bluestore/bluestore_types: reorder onode_t types

Save 8 bytes.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index e9cfdf94b853..f9c7c2b89569 100644
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -665,11 +665,6 @@ struct bluestore_onode_t {
   uint64_t nid = 0;                    ///< numeric id (locally unique)
   uint64_t size = 0;                   ///< object size
   map<string, bufferptr> attrs;        ///< attrs
-  uint8_t flags = 0;
-
-  enum {
-    FLAG_OMAP = 1,
-  };
 
   struct shard_info {
     uint32_t offset = 0;  ///< logical offset for start of shard
@@ -688,6 +683,12 @@ struct bluestore_onode_t {
   uint32_t expected_write_size = 0;
   uint32_t alloc_hint_flags = 0;
 
+  uint8_t flags = 0;
+
+  enum {
+    FLAG_OMAP = 1,
+  };
+
   string get_flags_string() const {
     string s;
     if (flags & FLAG_OMAP) {