From 4b224b9b8dbb4c26058775f6fa5c47ef83f87cdf Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 22 Jan 2009 11:22:04 -0800
Subject: [PATCH] mds: eval_cap_gather in handle_client_caps even if no update

We may have recalled caps and journaled an update for some but
not all locks.  We should check for cap gathers even if something
(else) is journaled.
---
 src/mds/Locker.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index d4b0496c7101d..69a4d44cffcf4 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1501,11 +1501,11 @@ void Locker::handle_client_caps(MClientCaps *m)
 	  _finish_release_cap(in, client, releasecap, ack);
 	else if (ack)
 	  mds->send_message_client(ack, client);
-	
-	eval_cap_gather(in);
-	if (in->filelock.is_stable())
-	  file_eval(&in->filelock);
       }
+	
+      eval_cap_gather(in);
+      if (in->filelock.is_stable())
+	file_eval(&in->filelock);
     }
 
     // done?
-- 
2.39.5