From a25d6fd89f32c6a2bacdfacd0893384eb8061d8c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Apr 2018 09:12:43 -0500 Subject: [PATCH] osd: move sdata_op_ordering_lock declaration So that comment makes sense Signed-off-by: Sage Weil --- src/osd/OSD.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 53f20ef1b0740..4e73e0309e9f4 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. -- 2.39.5