update sources to v12.1.1

[ceph.git] / ceph / src / compressor / zlib / ZlibCompressor.cc

diff --git a/ceph/src/compressor/zlib/ZlibCompressor.cc b/ceph/src/compressor/zlib/ZlibCompressor.cc
index beb2f195d40c2453390051c2e77fe9c6f3aab16f..492e6328d361583d448935e4aa41ef9b8776d228 100644 (file)
--- a/ceph/src/compressor/zlib/ZlibCompressor.cc
+++ b/ceph/src/compressor/zlib/ZlibCompressor.cc
@@ -22,7 +22,7 @@
 #include <zlib.h>
 
 // -----------------------------------------------------------------------------
-#define dout_context g_ceph_context
+#define dout_context cct
 #define dout_subsys ceph_subsys_compressor
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
@@ -59,7 +59,7 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out)
   strm.zalloc = Z_NULL;
   strm.zfree = Z_NULL;
   strm.opaque = Z_NULL;
-  ret = deflateInit2(&strm, g_conf->compressor_zlib_level, Z_DEFLATED, ZLIB_DEFAULT_WIN_SIZE, ZLIB_MEMORY_LEVEL, Z_DEFAULT_STRATEGY);
+  ret = deflateInit2(&strm, cct->_conf->compressor_zlib_level, Z_DEFLATED, ZLIB_DEFAULT_WIN_SIZE, ZLIB_MEMORY_LEVEL, Z_DEFAULT_STRATEGY);
   if (ret != Z_OK) {
     dout(1) << "Compression init error: init return "
          << ret << " instead of Z_OK" << dendl;