Merge PR ceph#37163 into master

* refs/pull/37163/head: mds: silence warning ‘MDSRank::fs_name’ will be initialized after [-Wreorder] Reviewed-by: Patrick Donnelly <[email protected]>
trociny · Sep 18, 2020 · ff16f5d · ff16f5d
2 parents 5126bfc + 2c2bcf6
commit ff16f5d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
@@ -488,13 +488,13 @@ MDSRank::MDSRank(
     Context *respawn_hook_,
     Context *suicide_hook_,
     boost::asio::io_context& ioc) :
-    cct(msgr->cct), fs_name(fs_name_), mds_lock(mds_lock_), clog(clog_),
+    cct(msgr->cct), mds_lock(mds_lock_), clog(clog_),
     timer(timer_), mdsmap(mdsmap_),
     objecter(new Objecter(g_ceph_context, msgr, monc_, ioc, 0, 0)),
     damage_table(whoami_), sessionmap(this),
     op_tracker(g_ceph_context, g_conf()->mds_enable_op_tracker,
                g_conf()->osd_num_op_tracker_shard),
-    progress_thread(this), whoami(whoami_),
+    progress_thread(this), whoami(whoami_), fs_name(fs_name_),
     purge_queue(g_ceph_context, whoami_,
       mdsmap_->get_metadata_pool(), objecter,
       new LambdaContext([this](int r) {