From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 15 Sep 2017 11:49:52 +0000 (+0800)
Subject: Merge pull request #17611 from chardan/jfw-wip-atomic_t-cleanup
X-Git-Tag: v13.0.1~911
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f18e0fef87d5fced85b3de1d6f8d006851449a1b;p=ceph.git

Merge pull request #17611 from chardan/jfw-wip-atomic_t-cleanup

follow-up fixups for atomic_t spinlocks

Reviewed-by: Adam Emerson <aemerson@redhat.com>
---

f18e0fef87d5fced85b3de1d6f8d006851449a1b
diff --cc src/msg/xio/XioConnection.cc
index 491d6646e09,9fd699752e2..7964a15901a
--- a/src/msg/xio/XioConnection.cc
+++ b/src/msg/xio/XioConnection.cc
@@@ -819,11 -816,11 +816,11 @@@ int XioConnection::CState::state_flow_c
  int XioConnection::CState::state_fail(Message* m, uint32_t flags)
  {
    if (! (flags & OP_FLAG_LOCKED))
-     pthread_spin_lock(&xcon->sp);
+     xcon->sp.lock();
  
    // advance to state FAIL, drop queued, msgs, adjust LRU
 -  session_state = session_states::DISCONNECTED);
 -  startup_state = session_startup_states::FAIL);
 +  session_state = session_states::DISCONNECTED;
 +  startup_state = session_startup_states::FAIL;
  
    xcon->discard_out_queues(flags|OP_FLAG_LOCKED);
    xcon->adjust_clru(flags|OP_FLAG_LOCKED|OP_FLAG_LRU);