]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
client: fix ancient typo in caps revocation path
authorSage Weil <sage@inktank.com>
Sat, 15 Jun 2013 15:48:37 +0000 (08:48 -0700)
committerSage Weil <sage@inktank.com>
Mon, 17 Jun 2013 17:41:56 +0000 (10:41 -0700)
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>
src/client/Client.cc

index 21cf267860729654eefc2e98ca99ee5c873e418e..a17254b60b52e78d7a4ca623d5a791daa4d3fc15 100644 (file)
@@ -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;
     }