From: Sage Weil <sage@inktank.com>
Date: Sat, 15 Jun 2013 15:48:37 +0000 (-0700)
Subject: client: fix ancient typo in caps revocation path
X-Git-Tag: v0.65~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7143c2f84daafbe2c27d5b2a2d5dc40c3a68d15;p=ceph.git

client: fix ancient typo in caps revocation path

If we have dropped all references to a revoked capability, send the ack
to the MDS.  This typo has been there since v0.7 (early 2009)!

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 21cf26786072..a17254b60b52 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -2414,7 +2414,7 @@ void Client::check_caps(Inode *in, bool is_delayed)
     }
 
     /* completed revocation? */
-    if (revoking && (revoking && used) == 0) {
+    if (revoking && (revoking & used) == 0) {
       ldout(cct, 10) << "completed revocation of " << ccap_string(cap->implemented & ~cap->issued) << dendl;
       goto ack;
     }