mds: drop useless from field from MInodeFileCaps

While we're updating the protocol, clean this up too.

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

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index bfe2fe34244b6d35d469e5a28d4168c7370c70f7..a39c3c194252521a27d0b0dc2e528454e392f760 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1771,8 +1771,7 @@ void Locker::request_inode_file_caps(CInode *in)
     in->replica_caps_wanted = wanted;
 
     if (mds->mdsmap->get_state(auth) >= MDSMap::STATE_REJOIN)
-      mds->send_message_mds(new MInodeFileCaps(in->ino(), mds->get_nodeid(),
-                                              in->replica_caps_wanted),
+      mds->send_message_mds(new MInodeFileCaps(in->ino(), in->replica_caps_wanted),
                            auth);
   } else {
     in->replica_caps_wanted_keep_until.sec_ref() = 0;
@@ -1787,6 +1786,8 @@ void Locker::handle_inode_file_caps(MInodeFileCaps *m)
 
   // ok
   CInode *in = mdcache->get_inode(m->get_ino());
+  int from = m->get_source().num();
+
   assert(in);
   assert(in->is_auth());
 
@@ -1798,12 +1799,12 @@ void Locker::handle_inode_file_caps(MInodeFileCaps *m)
   }
 
   
-  dout(7) << "handle_inode_file_caps replica mds" << m->get_from() << " wants caps " << ccap_string(m->get_caps()) << " on " << *in << dendl;
+  dout(7) << "handle_inode_file_caps replica mds" << from << " wants caps " << ccap_string(m->get_caps()) << " on " << *in << dendl;
 
   if (m->get_caps())
-    in->mds_caps_wanted[m->get_from()] = m->get_caps();
+    in->mds_caps_wanted[from] = m->get_caps();
   else
-    in->mds_caps_wanted.erase(m->get_from());
+    in->mds_caps_wanted.erase(from);
 
   try_eval(in, CEPH_CAP_LOCKS);
   m->put();

diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index bbe3707736e524597b24665bc766409641178f3b..0568303b215ed10042ff1936d955f30e4cf0b5c1 100644 (file)
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -18,20 +18,16 @@
 
 class MInodeFileCaps : public Message {
   inodeno_t ino;
-  __s32     from;
   __u32     caps;
 
  public:
   inodeno_t get_ino() { return ino; }
-  int       get_from() { return from; }
   int       get_caps() { return caps; }
 
   MInodeFileCaps() {}
-  // from auth
-  MInodeFileCaps(inodeno_t ino, int from, int caps) :
+  MInodeFileCaps(inodeno_t ino, int caps) :
     Message(MSG_MDS_INODEFILECAPS) {
     this->ino = ino;
-    this->from = from;
     this->caps = caps;
   }
 private:
@@ -44,13 +40,11 @@ public:
   }
   
   void encode_payload(CephContext *cct) {
-    ::encode(from, payload);
     ::encode(ino, payload);
     ::encode(caps, payload);
   }
   void decode_payload(CephContext *cct) {
     bufferlist::iterator p = payload.begin();
-    ::decode(from, p);
     ::decode(ino, p);
     ::decode(caps, p);
   }