mds: minor cap cleanups

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 73f7010e369df979db45616ed7077082f41d582c..58bb039b1e152e56e889a4f28d998c553840e899 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -2283,8 +2283,9 @@ Capability *CInode::add_client_cap(client_t client, Session *session, SnapRealm
   if (client_caps.empty())
     mdcache->num_inodes_with_caps++;
   
+  Capability *cap = new Capability(this, ++mdcache->last_cap_id, client);
   assert(client_caps.count(client) == 0);
-  Capability *cap = client_caps[client] = new Capability(this, ++mdcache->last_cap_id, client);
+  client_caps[client] = cap;
   if (session)
     session->add_cap(cap);
   

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 87f9f5211f7f43332d9520ff9e47491f4d36a75b..f162369c90ee01066030377a61dbccaca070d7f4 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2294,7 +2294,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const
   }
 
   if (cap->get_cap_id() != cap_id) {
-    dout(7) << " cap_id " << cap_id << " < " << cap->get_cap_id() << ", dropping" << dendl;
+    dout(7) << " cap_id " << cap_id << " != " << cap->get_cap_id() << ", dropping" << dendl;
     return;
   }