]> 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:42:29 +0000 (10:42 -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>
(cherry picked from commit b7143c2f84daafbe2c27d5b2a2d5dc40c3a68d15)

src/client/Client.cc

index 0f064636bdb9c854a3384a3426f6de33091ad4ed..7f17a3de2a584d5ec8d7e9cb15021a88fbebf507 100644 (file)
@@ -2411,7 +2411,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;
     }