update sources to 12.2.10

[ceph.git] / ceph / src / librbd / ManagedLock.h

diff --git a/ceph/src/librbd/ManagedLock.h b/ceph/src/librbd/ManagedLock.h
index c619f4823dd226adc5776c454b76b9019c38396e..a152adfc84d6207048353db9b0bc2081228f7c5f 100644 (file)
--- a/ceph/src/librbd/ManagedLock.h
+++ b/ceph/src/librbd/ManagedLock.h
@@ -55,7 +55,7 @@ public:
   void acquire_lock(Context *on_acquired);
   void try_acquire_lock(Context *on_acquired);
   void release_lock(Context *on_released);
-  void reacquire_lock(Context *on_reacquired = nullptr);
+  void reacquire_lock(Context *on_reacquired);
   void get_locker(managed_lock::Locker *locker, Context *on_finish);
   void break_lock(const managed_lock::Locker &locker, bool force_break_lock,
                   Context *on_finish);
@@ -240,11 +240,14 @@ private:
   void send_acquire_lock();
   void handle_pre_acquire_lock(int r);
   void handle_acquire_lock(int r);
+  void handle_no_op_reacquire_lock(int r);
+
   void handle_post_acquire_lock(int r);
   void revert_to_unlock_state(int r);
 
   void send_reacquire_lock();
   void handle_reacquire_lock(int r);
+  void release_acquire_lock();
 
   void send_release_lock();
   void handle_pre_release_lock(int r);