os/filestore: avoid using global `g_ceph_context`

always prefer using the local one, for better readability and
testability.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h
index d2475e437f88a1107e89eb281b91edb58d7dc486..b0204366265af14f6c11c167bfd73d6334fd3f0f 100644 (file)
--- a/src/os/filestore/FileJournal.h
+++ b/src/os/filestore/FileJournal.h
@@ -417,7 +417,7 @@ private:
     full_state(FULL_NOTFULL),
     fd(-1),
     writing_seq(0),
-    throttle(cct->_conf->filestore_caller_concurrency),
+    throttle(cct, cct->_conf->filestore_caller_concurrency),
     write_stop(true),
     aio_stop(true),
     write_thread(this),

diff --git a/src/os/filestore/JournalThrottle.h b/src/os/filestore/JournalThrottle.h
index 75485d6d8f30461fc51ca5950dcc9b01e853f784..f32f5d734f54d0af10b1bb6090f8495b8e953f4e 100644 (file)
--- a/src/os/filestore/JournalThrottle.h
+++ b/src/os/filestore/JournalThrottle.h
@@ -94,8 +94,9 @@ public:
   uint64_t get_max();
 
   JournalThrottle(
+    CephContext *cct,
     unsigned expected_concurrency ///< [in] determines size of conds
-    ) : throttle(g_ceph_context, "filestore_journal", expected_concurrency) {}
+    ) : throttle(cct, "filestore_journal", expected_concurrency) {}
 };
 
 #endif