]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: move sdata_op_ordering_lock declaration
authorSage Weil <sage@redhat.com>
Mon, 2 Apr 2018 14:12:43 +0000 (09:12 -0500)
committerSage Weil <sage@redhat.com>
Wed, 4 Apr 2018 13:27:00 +0000 (08:27 -0500)
So that comment makes sense

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.h

index 53f20ef1b074054e5c004380ad572f2092e89092..4e73e0309e9f4b835f83031f554673885d16df48 100644 (file)
@@ -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.