From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 28 Apr 2015 07:45:32 +0000 (+0800)
Subject: mds: remove caps from revoking list when caps are voluntarily released
X-Git-Tag: v9.0.1~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4474%2Fhead;p=ceph.git

mds: remove caps from revoking list when caps are voluntarily released

Fixes: #11482
Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 9d7af3d3f7e9..55922ab3711e 100644
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -209,8 +209,13 @@ public:
       _revokes.pop_front();
       changed = true;
     }
-    if (changed)
+    if (changed) {
       _calc_issued();
+      if (_issued == _pending) {
+	item_revoking_caps.remove_myself();
+	item_client_revoking_caps.remove_myself();
+      }
+    }
   }