mds: cleanup code that kills session requests

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit a10f051af25640def2ca6132de42693975de5ba1)

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 42d15f96427931f589dedd1fbd83e9987ec007bf..56521c754a0dc6a4c33e63a325ab21dd16b9a269 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1205,11 +1205,8 @@ void Server::journal_close_session(Session *session, int state, Context *on_safe
   mdlog->flush();
 
   // clean up requests, too
-  elist<MDRequestImpl*>::iterator p =
-    session->requests.begin(member_offset(MDRequestImpl,
-                                         item_session_request));
-  while (!p.end()) {
-    MDRequestRef mdr = mdcache->request_get((*p)->reqid);
+  for (auto p = session->requests.begin(); !p.end(); ) {
+    MDRequestRef mdr(*p);
     ++p;
     mdcache->request_kill(mdr);
   }

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index 3259d5f807ec50a6b50771cc49a76a3ca4bf6991..ae80cef5d4bb1b559c2969d0f685a0826d36c47d 100644 (file)
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -891,13 +891,8 @@ void SessionMap::save_if_dirty(const std::set<entity_name_t> &tgt_sessions,
 size_t Session::get_request_count() const
 {
   size_t result = 0;
-
-  auto it = requests.begin(member_offset(MDRequestImpl, item_session_request));
-  while (!it.end()) {
+  for (auto p = requests.begin(); !p.end(); ++p)
     ++result;
-    ++it;
-  }
-
   return result;
 }
 

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 6f694b8c32a9ad5838357c349fafe45fb07bf2ed..fd2ba781e6c680e26222e4df7424037c5946e39d 100644 (file)
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -425,7 +425,7 @@ public:
     birth_time(clock::now()),
     auth_caps(g_ceph_context),
     item_session_list(this),
-    requests(0)  // member_offset passed to front() manually
+    requests(member_offset(MDRequestImpl, item_session_request))
   {
     set_connection(std::move(con));
   }