mds: refactor process_cap_update a bit

Fewer args

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index d5155458790a2d5ed519bd40080edad6516bc1f7..a9a28bd991116fce17d692bf4401117f40fd8ad5 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1987,11 +1987,17 @@ void Locker::handle_client_caps(MClientCaps *m)
   m->put();
 }
 
-void Locker::process_cap_update(MDRequest *mdr, client_t client,
-                               inodeno_t ino, uint64_t cap_id, int caps, int wanted,
-                               int seq, int issue_seq, int mseq,
-                               const string& dname)
+void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const ceph_mds_request_release& item,
+                                        const string &dname)
 {
+  inodeno_t ino = (uint64_t)item.ino;
+  uint64_t cap_id = item.cap_id;
+  int caps = item.caps;
+  int wanted = item.wanted;
+  int seq = item.seq;
+  int issue_seq = item.issue_seq;
+  int mseq = item.mseq;
+
   CInode *in = mdcache->get_inode(ino);
   if (!in)
     return;

diff --git a/src/mds/Locker.h b/src/mds/Locker.h
index 63a4628ce9020675a5382ef6e215dded8fe98d3d..541b948ae42f75e379a0c62f6ecc99838a6521e8 100644 (file)
--- a/src/mds/Locker.h
+++ b/src/mds/Locker.h
@@ -186,10 +186,9 @@ public:
 
 
   // caps
-  void process_cap_update(MDRequest *mdr, client_t client,
-                         inodeno_t ino, uint64_t cap_id, int caps, int wanted,
-                         int seq, int issue_seq, int mseq,
-                         const string& dname);
+  void process_request_cap_release(MDRequest *mdr, client_t client, const ceph_mds_request_release& r,
+                                  const string &dname);
+
   void kick_cap_releases(MDRequest *mdr);
 
   void remove_client_cap(CInode *in, client_t client);

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index e84ee1f618867d08853eb72381e9108a1615967e..edb678b408c24970ba4f66f81cb066279933f91c 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1100,12 +1100,7 @@ void Server::handle_client_request(MClientRequest *req)
     for (vector<MClientRequest::Release>::iterator p = req->releases.begin();
         p != req->releases.end();
         p++)
-      mds->locker->process_cap_update(mdr, client,
-                                     inodeno_t((uint64_t)p->item.ino), p->item.cap_id,
-                                     p->item.caps, p->item.wanted,
-                                     p->item.seq, 
-                                     p->item.issue_seq, 
-                                     p->item.mseq, p->dname);
+      mds->locker->process_request_cap_release(mdr, client, p->item, p->dname);
   }