From: Yunchuan Wen Date: Fri, 9 Dec 2016 05:08:57 +0000 (+0800) Subject: mds: use std::make_shared to replace new X-Git-Tag: v12.0.0~274^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a187cbbffe2e40ad4f75fad706b9d1281bf767d;p=ceph.git mds: use std::make_shared to replace new Signed-off-by: Yunchuan Wen --- diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index ac31dc850bc..9ecbc07cbf8 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -1889,7 +1889,7 @@ void CInode::finish_scatter_update(ScatterLock *lock, CDir *dir, dout(10) << "finish_scatter_update " << fg << " journaling accounted scatterstat update v" << inode_version << dendl; MDLog *mdlog = mdcache->mds->mdlog; - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mdlog->get_current_segment(); inode_t *pi = get_projected_inode(); diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 544975ef3a9..0e9ef021433 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2260,7 +2260,7 @@ bool Locker::check_inode_max_size(CInode *in, bool force_wrlock, } } - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); inode_t *pi = in->project_inode(); @@ -2924,7 +2924,7 @@ void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t foll EUpdate *le = new EUpdate(mds->mdlog, "snap flush"); mds->mdlog->start_entry(le); - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); // normal metadata updates that we can apply to the head as well. @@ -3219,7 +3219,7 @@ bool Locker::_do_cap_update(CInode *in, Capability *cap, inode_t *pi = in->project_inode(px); pi->version = in->pre_dirty(); - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); _update_cap_fields(in, dirty, m, pi); @@ -4224,7 +4224,7 @@ void Locker::scatter_writebehind(ScatterLock *lock) dout(10) << "scatter_writebehind " << in->inode.mtime << " on " << *lock << " on " << *in << dendl; // journal - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); // forcefully take a wrlock diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index d89480f12de..f5d164f1375 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -508,7 +508,7 @@ void MDCache::_create_system_file(CDir *dir, const char *name, CInode *in, MDSIn SnapRealm *realm = dir->get_inode()->find_snaprealm(); dn->first = in->first = realm->get_newest_seq() + 1; - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); // force some locks. hacky. mds->locker->wrlock_force(&dir->inode->filelock, mut); @@ -957,7 +957,7 @@ void MDCache::try_subtree_merge_at(CDir *dir, bool do_eval) inode_t *pi = in->project_inode(); pi->version = in->pre_dirty(); - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); EUpdate *le = new EUpdate(mds->mdlog, "subtree merge writebehind"); mds->mdlog->start_entry(le); @@ -6066,7 +6066,7 @@ void MDCache::queue_file_recover(CInode *in) inode_t *pi = in->project_inode(); pi->version = in->pre_dirty(); - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); EUpdate *le = new EUpdate(mds->mdlog, "queue_file_recover cow"); mds->mdlog->start_entry(le); @@ -6279,7 +6279,7 @@ void MDCache::truncate_inode_finish(CInode *in, LogSegment *ls) pi->truncate_from = 0; pi->truncate_pending--; - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); mut->add_projected_inode(in); @@ -9175,7 +9175,7 @@ void MDCache::snaprealm_create(MDRequestRef& mdr, CInode *in) return; } - MutationRef mut(new MutationImpl); + auto mut(std::make_shared()); mut->ls = mds->mdlog->get_current_segment(); EUpdate *le = new EUpdate(mds->mdlog, "snaprealm_create"); mds->mdlog->start_entry(le); diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 1173d355008..5b0c141e38c 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -957,7 +957,7 @@ void Migrator::export_frozen(CDir *dir, uint64_t tid) return; } - it->second.mut = MutationRef(new MutationImpl); + it->second.mut = std::make_shared(); if (diri->is_auth()) it->second.mut->auth_pin(diri); mds->locker->rdlock_take_set(rdlocks, it->second.mut); @@ -2165,7 +2165,7 @@ void Migrator::handle_export_prep(MExportDirPrep *m) if (!mds->mdcache->is_readonly() && dir->get_inode()->filelock.can_wrlock(-1) && dir->get_inode()->nestlock.can_wrlock(-1)) { - it->second.mut = MutationRef(new MutationImpl); + it->second.mut = std::make_shared(); // force some locks. hacky. mds->locker->wrlock_force(&dir->inode->filelock, it->second.mut); mds->locker->wrlock_force(&dir->inode->nestlock, it->second.mut); diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 7c8702d2bcd..95bc8c6db7c 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -5325,7 +5325,7 @@ void Server::do_link_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& mdcache->add_rollback(rollback.reqid, master); // need to finish this update before resolve finishes assert(mdr || mds->is_resolve()); - MutationRef mut(new MutationImpl(rollback.reqid)); + auto mut(std::make_shared(rollback.reqid)); mut->ls = mds->mdlog->get_current_segment(); CInode *in = mdcache->get_inode(rollback.ino); @@ -7577,7 +7577,7 @@ void Server::do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef // need to finish this update before sending resolve to claim the subtree mdcache->add_rollback(rollback.reqid, master); - MutationRef mut(new MutationImpl(rollback.reqid)); + auto mut(std::make_shared(rollback.reqid)); mut->ls = mds->mdlog->get_current_segment(); CDentry *srcdn = NULL;