]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix null pointer dereference in MDCache::rejoin_send_rejoins()
authorYan, Zheng <zheng.z.yan@intel.com>
Sun, 23 Mar 2014 00:02:08 +0000 (08:02 +0800)
committerYan, Zheng <zheng.z.yan@intel.com>
Fri, 28 Mar 2014 18:08:13 +0000 (02:08 +0800)
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
src/mds/MDCache.cc

index 4a4957ba4091adbc3951a007840d2f5254b342e1..4b48465d612b0aa38696f70097ac40e794cc1797 100644 (file)
@@ -3616,6 +3616,8 @@ void MDCache::rejoin_send_rejoins()
         ++p) {
       assert(cap_export_targets.count(p->first));
       int target = cap_export_targets[p->first];
+      if (rejoins.count(target) == 0)
+       continue;
       rejoins[target]->cap_exports[p->first] = p->second;
       for (map<client_t,ceph_mds_cap_reconnect>::iterator q = p->second.begin();
           q != p->second.end();