From b0f4be72c0f9eaec2474a3f385f7d39a2c5b1f38 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Mon, 18 Nov 2019 20:53:51 +0530 Subject: [PATCH] mds: Reorganize class members in ScrubHeader header Fixes: https://tracker.ceph.com/issues/42865 Signed-off-by: Varsha Rao --- src/mds/ScrubHeader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mds/ScrubHeader.h b/src/mds/ScrubHeader.h index f49598d85e06..e69a3727c69f 100644 --- a/src/mds/ScrubHeader.h +++ b/src/mds/ScrubHeader.h @@ -29,7 +29,7 @@ public: ScrubHeader(std::string_view tag_, bool is_tag_internal_, bool force_, bool recursive_, bool repair_, Formatter *f_) : tag(tag_), is_tag_internal(is_tag_internal_), force(force_), - recursive(recursive_), repair(repair_), formatter(f_), origin(nullptr) + recursive(recursive_), repair(repair_), formatter(f_) { ceph_assert(formatter != nullptr); } @@ -56,7 +56,7 @@ protected: const bool recursive; const bool repair; Formatter * const formatter; - CInode *origin; + CInode *origin = nullptr; bool repaired = false; // May be set during scrub if repairs happened }; -- 2.47.3