From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Sat, 11 May 2013 17:51:02 +0000 (+0200)
Subject: osd/OSD.h: fix try_stop_deletion
X-Git-Tag: v0.63~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F274%2Fhead;p=ceph.git

osd/OSD.h: fix try_stop_deletion

Fix try_stop_deletion(): The comment above the while loop says "If we are
in DELETING_DIR or DELETED_DIR", but the while loop checks for DELETING_DIR
twice. Change one check to DELETED_DIR otherwise on state get missed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index d20c9b1268e0..905af9cfb2a3 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -216,7 +216,7 @@ public:
      * state, because this might block the caller behind entire pg
      * removals.
      */
-    while (status == DELETING_DIR || status == DELETING_DIR)
+    while (status == DELETING_DIR || status == DELETED_DIR)
       cond.Wait(lock);
     return status != DELETED_DIR;
   } ///< @return true if we don't need to recreate the collection