From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 29 May 2019 12:59:17 +0000 (+0800)
Subject: mds: avoid passing null to SessionmMap::hit_session()
X-Git-Tag: v14.2.2~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28618%2Fhead;p=ceph.git

mds: avoid passing null to SessionmMap::hit_session()

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index b509077431a3..e37be24e55de 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1958,7 +1958,7 @@ void Server::reply_client_request(MDRequestRef& mdr, const MClientReply::ref &re
     mds->logger->inc(l_mds_reply);
     utime_t lat = ceph_clock_now() - mdr->client_request->get_recv_stamp();
     mds->logger->tinc(l_mds_reply_latency, lat);
-    if (client_inst.name.is_client()) {
+    if (session && client_inst.name.is_client()) {
       mds->sessionmap.hit_session(session);
     }
     perf_gather_op_latency(req, lat);
@@ -1974,7 +1974,7 @@ void Server::reply_client_request(MDRequestRef& mdr, const MClientReply::ref &re
   mdcache->request_drop_non_rdlocks(mdr);
 
   // reply at all?
-  if (!(client_inst.name.is_mds() || !session)) {
+  if (session && !client_inst.name.is_mds()) {
     // send reply.
     if (!did_early_reply &&   // don't issue leases if we sent an earlier reply already
 	(tracei || tracedn)) {