From a3d76d61ec0dab59e961a0e7a828f0435c702e53 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 5 Apr 2018 08:09:44 +0800 Subject: [PATCH] mds: remove unused MDCache::snaprealm_create() Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 92 ---------------------------------------------- src/mds/MDCache.h | 2 - 2 files changed, 94 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 9caf909c00e..0222f41d4c3 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -9454,61 +9454,6 @@ void MDCache::create_global_snaprealm() global_snaprealm = in->snaprealm; } -struct C_MDC_snaprealm_create_finish : public MDCacheLogContext { - MDRequestRef mdr; - MutationRef mut; - CInode *in; - C_MDC_snaprealm_create_finish(MDCache *c, MDRequestRef& m, - MutationRef& mu, CInode *i) : - MDCacheLogContext(c), mdr(m), mut(mu), in(i) {} - void finish(int r) override { - mdcache->_snaprealm_create_finish(mdr, mut, in); - } -}; - -void MDCache::snaprealm_create(MDRequestRef& mdr, CInode *in) -{ - dout(10) << "snaprealm_create " << *in << dendl; - assert(!in->snaprealm); - - // allocate an id.. - if (!mdr->more()->stid) { - mds->snapclient->prepare_create_realm(in->ino(), &mdr->more()->stid, &mdr->more()->snapidbl, - new C_MDS_RetryRequest(this, mdr)); - return; - } - - MutationRef mut(new MutationImpl()); - mut->ls = mds->mdlog->get_current_segment(); - EUpdate *le = new EUpdate(mds->mdlog, "snaprealm_create"); - mds->mdlog->start_entry(le); - - le->metablob.add_table_transaction(TABLE_SNAP, mdr->more()->stid); - - auto &pi = in->project_inode(false, true); - pi.inode.version = in->pre_dirty(); - pi.inode.rstat.rsnaprealms++; - - bufferlist::iterator p = mdr->more()->snapidbl.begin(); - snapid_t seq; - decode(seq, p); - - auto &newsnap = *pi.snapnode; - newsnap.created = seq; - newsnap.seq = seq; - newsnap.last_created = seq; - - predirty_journal_parents(mut, &le->metablob, in, 0, PREDIRTY_PRIMARY); - journal_cow_inode(mut, &le->metablob, in); - le->metablob.add_primary_dentry(in->get_projected_parent_dn(), in, true); - - mds->server->submit_mdlog_entry(le, - new C_MDC_snaprealm_create_finish(this, mdr, - mut, in), - mdr, __func__); - mds->mdlog->flush(); -} - void MDCache::do_realm_invalidate_and_update_notify(CInode *in, int snapop, bool notify_clients) { dout(10) << "do_realm_invalidate_and_update_notify " << *in->snaprealm << " " << *in << dendl; @@ -9614,43 +9559,6 @@ void MDCache::do_realm_invalidate_and_update_notify(CInode *in, int snapop, bool } } -void MDCache::_snaprealm_create_finish(MDRequestRef& mdr, MutationRef& mut, CInode *in) -{ - dout(10) << "_snaprealm_create_finish " << *in << dendl; - - // apply - in->pop_and_dirty_projected_inode(mut->ls); - mut->apply(); - mds->locker->drop_locks(mut.get()); - mut->cleanup(); - - // tell table we've committed - mds->snapclient->commit(mdr->more()->stid, mut->ls); - - // create - bufferlist::iterator p = mdr->more()->snapidbl.begin(); - snapid_t seq; - decode(seq, p); - - in->open_snaprealm(); - in->snaprealm->srnode.seq = seq; - in->snaprealm->srnode.created = seq; - bool ok = in->snaprealm->_open_parents(NULL); - assert(ok); - - do_realm_invalidate_and_update_notify(in, CEPH_SNAP_OP_SPLIT); - - /* - static int count = 5; - if (--count == 0) - ceph_abort(); // hack test test ********** - */ - - // done. - mdr->more()->stid = 0; // caller will likely need to reuse this - dispatch_request(mdr); -} - void MDCache::send_snap_update(CInode *in, version_t stid, int snap_op) { dout(10) << __func__ << " " << *in << " stid " << stid << dendl; diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index 119b38f5a51..41d8eda5f5d 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -1052,8 +1052,6 @@ private: public: SnapRealm *get_global_snaprealm() const { return global_snaprealm; } void create_global_snaprealm(); - void snaprealm_create(MDRequestRef& mdr, CInode *in); - void _snaprealm_create_finish(MDRequestRef& mdr, MutationRef& mut, CInode *in); void do_realm_invalidate_and_update_notify(CInode *in, int snapop, bool notify_clients=true); void send_snap_update(CInode *in, version_t stid, int snap_op); void handle_snap_update(MMDSSnapUpdate *m); -- 2.39.5