From d651658d17582b601120aee246e7528e2fdb7beb Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 31 Jul 2013 11:10:51 -0700 Subject: [PATCH] osdc: Add asserts that client_lock is held Clarify locking by indicating that client_lock is held Signed-off-by: David Zafman --- src/osdc/Objecter.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index b7530200298..3632ae1c24c 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -749,6 +749,7 @@ void Objecter::check_op_pool_dne(Op *op) void Objecter::_send_op_map_check(Op *op) { + assert(client_lock.is_locked()); // ask the monitor if (check_latest_map_ops.count(op->tid) == 0) { check_latest_map_ops[op->tid] = op; @@ -759,6 +760,7 @@ void Objecter::_send_op_map_check(Op *op) void Objecter::op_cancel_map_check(Op *op) { + assert(client_lock.is_locked()); map::iterator iter = check_latest_map_ops.find(op->tid); if (iter != check_latest_map_ops.end()) { @@ -1101,6 +1103,7 @@ void Objecter::tick() void Objecter::resend_mon_ops() { + assert(client_lock.is_locked()); ldout(cct, 10) << "resend_mon_ops" << dendl; for (map::iterator p = poolstat_ops.begin(); p!=poolstat_ops.end(); ++p) { -- 2.47.3