From: Yan, Zheng <zyan@redhat.com>
Date: Sun, 3 May 2020 15:17:51 +0000 (+0800)
Subject: mds: remove ScrubStack::scrubstack
X-Git-Tag: v16.1.0~577^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afb2e12078f2cb7601f489101432dbc815e9887d;p=ceph.git

mds: remove ScrubStack::scrubstack

comment says it's hack for dout. I don't see any reason it's needed.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index b2e426757a47c..93f879307e5a2 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -23,7 +23,7 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
-#define dout_prefix _prefix(_dout, scrubstack->mdcache->mds)
+#define dout_prefix _prefix(_dout, mdcache->mds)
 static ostream& _prefix(std::ostream *_dout, MDSRank *mds) {
   return *_dout << "mds." << mds->get_nodeid() << ".scrubstack ";
 }
diff --git a/src/mds/ScrubStack.h b/src/mds/ScrubStack.h
index 127679b48126f..7fedd37280129 100644
--- a/src/mds/ScrubStack.h
+++ b/src/mds/ScrubStack.h
@@ -34,7 +34,6 @@ public:
     clog(clog),
     finisher(finisher_),
     inode_stack(member_offset(CInode, item_scrub)),
-    scrubstack(this),
     scrub_kick(mdc, this) {}
   ~ScrubStack() {
     ceph_assert(inode_stack.empty());
@@ -141,7 +140,6 @@ protected:
   elist<CInode*> inode_stack;
   /// current number of dentries we're actually scrubbing
   int scrubs_in_progress = 0;
-  ScrubStack *scrubstack; // hack for dout
   int stack_size = 0;
 
   C_KickOffScrubs scrub_kick;