From 2ad85576850bcb61c3ac8fee38609f9cd51bfac2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 15 Jun 2013 08:48:37 -0700 Subject: [PATCH] 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 Reviewed-by: Greg Farnum (cherry picked from commit b7143c2f84daafbe2c27d5b2a2d5dc40c3a68d15) --- src/client/Client.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 0f064636bdb9c..7f17a3de2a584 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -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; } -- 2.39.5