From afef58bbd0027feb1435affc25a42ce8efd78d06 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 10 Nov 2015 21:36:40 +0800 Subject: [PATCH] mds: avoid potenial double get CDentry::PIN_SCRUBQUEUE Signed-off-by: Yan, Zheng --- src/mds/ScrubStack.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc index a9480818faff..f4ada6ed24b9 100644 --- a/src/mds/ScrubStack.cc +++ b/src/mds/ScrubStack.cc @@ -30,8 +30,8 @@ static ostream& _prefix(std::ostream *_dout, MDSRank *mds) { void ScrubStack::push_dentry(CDentry *dentry) { dout(20) << "pushing " << *dentry << " on top of ScrubStack" << dendl; - dentry->get(CDentry::PIN_SCRUBQUEUE); if (!dentry->item_scrub.is_on_list()) { + dentry->get(CDentry::PIN_SCRUBQUEUE); stack_size++; } dentry_stack.push_front(&dentry->item_scrub); @@ -40,8 +40,8 @@ void ScrubStack::push_dentry(CDentry *dentry) void ScrubStack::push_dentry_bottom(CDentry *dentry) { dout(20) << "pushing " << *dentry << " on bottom of ScrubStack" << dendl; - dentry->get(CDentry::PIN_SCRUBQUEUE); if (!dentry->item_scrub.is_on_list()) { + dentry->get(CDentry::PIN_SCRUBQUEUE); stack_size++; } dentry_stack.push_back(&dentry->item_scrub); -- 2.47.3