From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 8 Dec 2016 03:04:57 +0000 (-0500)
Subject: objclass: Utterly destroy g_ceph_context
X-Git-Tag: v12.0.0~384^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f971d6489ddd097003d95261339357fbf0ad6064;p=ceph-ci.git

objclass: Utterly destroy g_ceph_context

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc
index a406baf872f..724842c1cb1 100644
--- a/src/objclass/class_api.cc
+++ b/src/objclass/class_api.cc
@@ -13,10 +13,9 @@
 #include "auth/Crypto.h"
 #include "common/armor.h"
 
-static ClassHandler *ch;
+static constexpr int dout_subsys = ceph_subsys_objclass;
 
-#define dout_context g_ceph_context
-#define dout_subsys ceph_subsys_objclass
+static ClassHandler *ch;
 
 void cls_initialize(ClassHandler *h)
 {
@@ -643,14 +642,14 @@ int cls_gen_rand_base64(char *dest, int size) /* size should be the required str
 
   ret = cls_gen_random_bytes(buf, sizeof(buf));
   if (ret < 0) {
-    generic_derr << "cannot get random bytes: " << ret << dendl;
+    lgeneric_derr(ch->cct) << "cannot get random bytes: " << ret << dendl;
     return -1;
   }
 
   ret = ceph_armor(tmp_dest, &tmp_dest[sizeof(tmp_dest)],
 		   (const char *)buf, ((const char *)buf) + ((size - 1) * 3 + 4 - 1) / 4);
   if (ret < 0) {
-    generic_derr << "ceph_armor failed" << dendl;
+    lgeneric_derr(ch->cct) << "ceph_armor failed" << dendl;
     return -1;
   }
   tmp_dest[ret] = '\0';
@@ -711,7 +710,7 @@ int cls_log(int level, const char *format, ...)
      va_end(ap);
 #define MAX_SIZE 8196
      if ((n > -1 && n < size) || size > MAX_SIZE) {
-       dout(level) << buf << dendl;
+       ldout(ch->cct, level) << buf << dendl;
        return n;
      }
      size *= 2;