From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Apr 2018 14:12:43 +0000 (-0500)
Subject: osd: move sdata_op_ordering_lock declaration
X-Git-Tag: v13.1.0~390^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a25d6fd89f32c6a2bacdfacd0893384eb8061d8c;p=ceph.git

osd: move sdata_op_ordering_lock declaration

So that comment makes sense

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

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 53f20ef1b074..4e73e0309e9f 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1112,9 +1112,6 @@ struct OSDShard {
   Mutex sdata_lock;
   Cond sdata_cond;
 
-  string sdata_op_ordering_lock_name;
-  Mutex sdata_op_ordering_lock;   ///< protects all members below
-
   string osdmap_lock_name;
   Mutex osdmap_lock;
   OSDMapRef osdmap;
@@ -1124,6 +1121,9 @@ struct OSDShard {
     return osdmap;
   }
 
+  string sdata_op_ordering_lock_name;
+  Mutex sdata_op_ordering_lock;   ///< protects remaining members below
+
   /// map of slots for each spg_t.  maintains ordering of items dequeued
   /// from pqueue while _process thread drops shard lock to acquire the
   /// pg lock.  stale slots are removed by consume_map.