import ceph 14.2.5

[ceph.git] / ceph / src / librbd / image / PreRemoveRequest.h

diff --git a/ceph/src/librbd/image/PreRemoveRequest.h b/ceph/src/librbd/image/PreRemoveRequest.h
index 99981491b651dc543175a4f531aad13ca2fc59bc..30f16b362133284fdf9d3d6a6dacecd812174a94 100644 (file)
--- a/ceph/src/librbd/image/PreRemoveRequest.h
+++ b/ceph/src/librbd/image/PreRemoveRequest.h
@@ -35,15 +35,12 @@ private:
    * @verbatim
    *
    *       <start>
-   *          |
-   *          v
-   *   CHECK EXCLUSIVE LOCK
-   *          |
-   *          v (skip if not needed)
-   *  ACQUIRE EXCLUSIVE LOCK
-   *          |
-   *          v
-   *   CHECK IMAGE WATCHERS
+   *          |   (skip if
+   *          v    not needed)   (error)
+   *  ACQUIRE EXCLUSIVE LOCK  * * * * * * > SHUT DOWN EXCLUSIVE LOCK
+   *          |                                |
+   *          v                                |
+   *   CHECK IMAGE WATCHERS <------------------/
    *          |
    *          v
    *     CHECK GROUP
@@ -72,7 +69,9 @@ private:
 
   void acquire_exclusive_lock();
   void handle_exclusive_lock(int r);
-  void handle_exclusive_lock_force(int r);
+
+  void shut_down_exclusive_lock();
+  void handle_shut_down_exclusive_lock(int r);
 
   void validate_image_removal();
   void check_image_snaps();