From 5d95201ee510ff1340b2e40179e87463322c784d Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 29 May 2019 20:59:17 +0800 Subject: [PATCH] mds: avoid passing null to SessionmMap::hit_session() Signed-off-by: "Yan, Zheng" (cherry picked from commit e3c6a9bba4264963e985b9f8e3371c2757e7803c) --- src/mds/Server.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) { -- 2.47.3