From 51db4d9ef7ee6f2d75d32e4606bf8c63005b0485 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 30 Mar 2010 16:34:30 -0700 Subject: [PATCH] msg: fix uses of MClientLease destructor to use put() --- src/client/Client.cc | 2 +- src/mds/Locker.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 6afa97fe65e98..d672e42a3f369 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -1497,7 +1497,7 @@ void Client::handle_lease(MClientLease *m) messenger->send_message(new MClientLease(CEPH_MDS_LEASE_RELEASE, seq, m->get_mask(), m->get_ino(), m->get_first(), m->get_last(), m->dname), m->get_source_inst()); - delete m; + m->put(); } diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index f1425e6281bb8..38fd763329729 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2114,7 +2114,7 @@ void Locker::handle_client_lease(MClientLease *m) CInode *in = mdcache->get_inode(m->get_ino(), m->get_last()); if (!in) { dout(7) << "handle_client_lease don't have ino " << m->get_ino() << "." << m->get_last() << dendl; - delete m; + m->put(); return; } CDentry *dn = 0; @@ -2126,7 +2126,7 @@ void Locker::handle_client_lease(MClientLease *m) dn = dir->lookup(m->dname); if (!dn) { dout(7) << "handle_client_lease don't have dn " << m->get_ino() << " " << m->dname << dendl; - delete m; + m->put(); return; } dout(10) << " on " << *dn << dendl; @@ -2135,7 +2135,7 @@ void Locker::handle_client_lease(MClientLease *m) ClientLease *l = dn->get_client_lease(client); if (!l) { dout(7) << "handle_client_lease didn't have lease for client" << client << " of " << *dn << dendl; - delete m; + m->put(); return; } @@ -2151,7 +2151,7 @@ void Locker::handle_client_lease(MClientLease *m) int left = dn->remove_client_lease(l, l->mask, this); dout(10) << " remaining mask is " << left << " on " << *dn << dendl; } - delete m; + m->put(); break; case CEPH_MDS_LEASE_RENEW: -- 2.39.5