import ceph 12.2.12

[ceph.git] / ceph / src / mds / CInode.cc

diff --git a/ceph/src/mds/CInode.cc b/ceph/src/mds/CInode.cc
index e8c1bc8bc1e3ece37bf17a1cb156ec83e76a2ddd..b91c47881f5eb07954cae4b44401fde29c10be68 100644 (file)
--- a/ceph/src/mds/CInode.cc
+++ b/ceph/src/mds/CInode.cc
@@ -218,7 +218,7 @@ ostream& operator<<(ostream& out, const CInode& in)
       if (it->second->issued() != it->second->pending())
        out << "/" << ccap_string(it->second->issued());
       out << "/" << ccap_string(it->second->wanted())
-         << "@" << it->second->get_last_sent();
+         << "@" << it->second->get_last_seq();
     }
     out << "}";
     if (in.get_loner() >= 0 || in.get_wanted_loner() >= 0) {
@@ -2812,14 +2812,10 @@ 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);
+  Capability *cap = new Capability(this, session, ++mdcache->last_cap_id);
   assert(client_caps.count(client) == 0);
   client_caps[client] = cap;
 
-  session->add_cap(cap);
-  if (session->is_stale())
-    cap->mark_stale();
-  
   cap->client_follows = first-1;
   
   containing_realm->add_cap(client, cap);
@@ -4264,7 +4260,7 @@ void CInode::dump(Formatter *f) const
     f->dump_string("pending", ccap_string(it->second->pending()));
     f->dump_string("issued", ccap_string(it->second->issued()));
     f->dump_string("wanted", ccap_string(it->second->wanted()));
-    f->dump_int("last_sent", it->second->get_last_sent());
+    f->dump_int("last_sent", it->second->get_last_seq());
     f->close_section();
   }
   f->close_section();