From: Samuel Just Date: Fri, 11 Mar 2016 23:16:37 +0000 (-0800) Subject: FileStore: fix initialization order for m_disable_wbthrottle X-Git-Tag: v10.1.0~134^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ba4badf491dcfcbe857ce35091774d9761328fbd;p=ceph.git FileStore: fix initialization order for m_disable_wbthrottle Signed-off-by: Samuel Just --- diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index 35589a3432886..6cd4134ce94ac 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -526,10 +526,10 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbit fdcache(g_ceph_context), wbthrottle(g_ceph_context), next_osr_id(0), - throttle_ops(g_conf->filestore_caller_concurrency), - throttle_bytes(g_conf->filestore_caller_concurrency), m_disable_wbthrottle(g_conf->filestore_odsync_write || !g_conf->filestore_wbthrottle_enable), + throttle_ops(g_conf->filestore_caller_concurrency), + throttle_bytes(g_conf->filestore_caller_concurrency), m_ondisk_finisher_num(g_conf->filestore_ondisk_finisher_threads), m_apply_finisher_num(g_conf->filestore_apply_finisher_threads), op_tp(g_ceph_context, "FileStore::op_tp", "tp_fstore_op", g_conf->filestore_op_threads, "filestore_op_threads"),