From: Yan, Zheng Date: Thu, 28 Jan 2016 13:32:05 +0000 (+0800) Subject: mds: remove unused 'Context *' parameter from MDCache::repair_foo_stats() X-Git-Tag: v10.1.0~176^2~1^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c52d44444f64a97d95f6f1ba8c75016822bd22f;p=ceph.git mds: remove unused 'Context *' parameter from MDCache::repair_foo_stats() Signed-off-by: Yan, Zheng --- diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index f216da465d3..0dae5bc1991 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -3096,7 +3096,7 @@ bool CDir::scrub_local() scrub_infop->pending_scrub_error = true; if (scrub_infop->header && scrub_infop->header->repair) - cache->repair_dirfrag_stats(this, NULL); + cache->repair_dirfrag_stats(this); } return rval; } diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 08135a093d2..dcafcf72b68 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -3953,7 +3953,7 @@ next: if (in->scrub_infop && in->scrub_infop->header && in->scrub_infop->header->repair) - in->mdcache->repair_inode_stats(in, NULL); + in->mdcache->repair_inode_stats(in); goto next; } if (frags_errors > 0) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 3bcd4be2401..cbd76342772 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -11775,14 +11775,12 @@ struct C_MDC_RepairDirfragStats : public MDSInternalContext { } }; -void MDCache::repair_dirfrag_stats(CDir *dir, Context *fin) +void MDCache::repair_dirfrag_stats(CDir *dir) { - if (!fin) - fin = new C_MDSInternalNoop; MDRequestRef mdr = request_start_internal(CEPH_MDS_OP_REPAIR_FRAGSTATS); mdr->pin(dir); mdr->internal_op_private = dir; - mdr->internal_op_finish = fin; + mdr->internal_op_finish = new C_MDSInternalNoop; repair_dirfrag_stats_work(mdr); } @@ -11877,14 +11875,12 @@ void MDCache::repair_dirfrag_stats_work(MDRequestRef& mdr) mds->mdlog->submit_entry(le, new C_MDC_RepairDirfragStats(mds, mdr)); } -void MDCache::repair_inode_stats(CInode *diri, Context *fin) +void MDCache::repair_inode_stats(CInode *diri) { - if (!fin) - fin = new C_MDSInternalNoop; MDRequestRef mdr = request_start_internal(CEPH_MDS_OP_REPAIR_INODESTATS); mdr->pin(diri); mdr->internal_op_private = diri; - mdr->internal_op_finish = fin; + mdr->internal_op_finish = new C_MDSInternalNoop; repair_inode_stats_work(mdr); } diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index 0994b77f92d..5aadc13981e 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -1151,8 +1151,8 @@ public: void enqueue_scrub(const string& path, const std::string &tag, bool force, bool recursive, bool repair, Formatter *f, Context *fin); - void repair_inode_stats(CInode *diri, Context *fin); - void repair_dirfrag_stats(CDir *dir, Context *fin); + void repair_inode_stats(CInode *diri); + void repair_dirfrag_stats(CDir *dir); }; class C_MDS_RetryRequest : public MDSInternalContext {