]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg: fix uses of MCacheExpire destructor to use put()
authorGreg Farnum <gregf@hq.newdream.net>
Wed, 31 Mar 2010 17:22:35 +0000 (10:22 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Wed, 31 Mar 2010 21:59:43 +0000 (14:59 -0700)
src/mds/MDCache.cc

index 917c724ee444261ad189afc150026db544efb2a0..8eae95aba797387e2d4efbafcc14db51a6d9be44 100644 (file)
@@ -5052,7 +5052,7 @@ void MDCache::handle_cache_expire(MCacheExpire *m)
   dout(7) << "cache_expire from mds" << from << dendl;
 
   if (mds->get_state() < MDSMap::STATE_REJOIN) {
-    delete m;
+    m->put();
     return;
   }
 
@@ -5197,7 +5197,7 @@ void MDCache::handle_cache_expire(MCacheExpire *m)
 
 
   // done
-  delete m;
+  m->put();
 }
 
 void MDCache::process_delayed_expire(CDir *dir)
@@ -5216,7 +5216,7 @@ void MDCache::discard_delayed_expire(CDir *dir)
   for (map<int,MCacheExpire*>::iterator p = delayed_expire[dir].begin();
        p != delayed_expire[dir].end();
        ++p) 
-    delete p->second;
+    p->second->put();
   delayed_expire.erase(dir);  
 }