From e01c93df9e9288244346c4babb87669598e84f53 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 10 Feb 2015 15:49:57 -0800 Subject: [PATCH] objecter: clarify a few lock assertions These are always called with the rwlock locked for write. Signed-off-by: Josh Durgin --- src/osdc/Objecter.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index edc1a1b50bd8f..68714c63a3c47 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1771,7 +1771,7 @@ void Objecter::kick_requests(OSDSession *session) void Objecter::_kick_requests(OSDSession *session, map& lresend) { - assert(rwlock.is_locked()); + assert(rwlock.is_wlocked()); // resend ops map resend; // resend in tid order @@ -1815,7 +1815,7 @@ void Objecter::_kick_requests(OSDSession *session, map& lr void Objecter::_linger_ops_resend(map& lresend) { - assert(rwlock.is_locked()); + assert(rwlock.is_wlocked()); while (!lresend.empty()) { LingerOp *op = lresend.begin()->second; @@ -2578,7 +2578,7 @@ void Objecter::_session_linger_op_assign(OSDSession *to, LingerOp *op) void Objecter::_session_linger_op_remove(OSDSession *from, LingerOp *op) { assert(from == op->session); - assert(from->lock.is_locked()); + assert(from->lock.is_wlocked()); if (from->is_homeless()) { num_homeless_ops.dec(); -- 2.39.5