]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: avoid passing null to SessionmMap::hit_session() 28293/head
authorYan, Zheng <zyan@redhat.com>
Wed, 29 May 2019 12:59:17 +0000 (20:59 +0800)
committerYan, Zheng <zyan@redhat.com>
Wed, 5 Jun 2019 13:11:31 +0000 (21:11 +0800)
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
src/mds/Server.cc

index fd4b900c56fa6a6c23f179eb413b1ed414b9b4ef..d4392d1b604339d85b36e2fe235694d0cf7dad5d 100644 (file)
@@ -1962,7 +1962,7 @@ void Server::reply_client_request(MDRequestRef& mdr, const ref_t<MClientReply> &
     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);
@@ -1978,7 +1978,7 @@ void Server::reply_client_request(MDRequestRef& mdr, const ref_t<MClientReply> &
   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)) {