update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / fiber / src / mutex.cpp

diff --git a/ceph/src/boost/libs/fiber/src/mutex.cpp b/ceph/src/boost/libs/fiber/src/mutex.cpp
index ad67cbd16206cfd780afbe2aea4f043663e409d7..554f73b637490dadcbc414041d292b70707c9e97 100644 (file)
--- a/ceph/src/boost/libs/fiber/src/mutex.cpp
+++ b/ceph/src/boost/libs/fiber/src/mutex.cpp
@@ -30,7 +30,8 @@ mutex::lock() {
             throw lock_error{
                     std::make_error_code( std::errc::resource_deadlock_would_occur),
                     "boost fiber: a deadlock is detected" };
-        } else if ( nullptr == owner_) {
+        }
+        if ( nullptr == owner_) {
             owner_ = active_ctx;
             return;
         }
@@ -50,7 +51,8 @@ mutex::try_lock() {
         throw lock_error{
                 std::make_error_code( std::errc::resource_deadlock_would_occur),
                 "boost fiber: a deadlock is detected" };
-    } else if ( nullptr == owner_) {
+    }
+    if ( nullptr == owner_) {
         owner_ = active_ctx;
     }
     lk.unlock();