auth: instantiate the templates if WITH_SEASTAR

specialize class/method of LockPolicy::SINGLE `#ifdef WITH_SEASTAR`.
in long term, probably we can remove `LockPolicy`, as WITH_SEASTAR
implies `LockPolicy::SINGLE`.

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

diff --git a/src/auth/AuthClientHandler.cc b/src/auth/AuthClientHandler.cc
index 1ac96a50c4f60e3b43f06ad657c8ee340c995cd3..fe0a5238f5495c8a4c9068dc56b443aefef5852d 100644 (file)
--- a/src/auth/AuthClientHandler.cc
+++ b/src/auth/AuthClientHandler.cc
@@ -36,8 +36,16 @@ AuthClientHandler::create(CephContext *cct, int proto,
 }
 
 // explicitly instantiate only the classes we need
+#ifdef WITH_SEASTAR
+template AuthClientHandler*
+AuthClientHandler::create<ceph::LockPolicy::SINGLE>(
+  CephContext *cct,
+  int proto,
+  RotatingKeyRing<ceph::LockPolicy::SINGLE> *rkeys);
+#else
 template AuthClientHandler*
 AuthClientHandler::create<ceph::LockPolicy::MUTEX>(
   CephContext *cct,
   int proto,
   RotatingKeyRing<ceph::LockPolicy::MUTEX> *rkeys);
+#endif

diff --git a/src/auth/RotatingKeyRing.cc b/src/auth/RotatingKeyRing.cc
index 196b1a120521871d88ad3a20d4b99e36dc78bee4..6fade65c8a01d6d30a7869bbf3fe1809696a8724 100644 (file)
--- a/src/auth/RotatingKeyRing.cc
+++ b/src/auth/RotatingKeyRing.cc
@@ -79,4 +79,8 @@ KeyRing *RotatingKeyRing<lp>::get_keyring()
 }
 
 // explicitly instantiate only the classes we need
+#ifdef WITH_SEASTAR
+template class RotatingKeyRing<LockPolicy::SINGLE>;
+#else
 template class RotatingKeyRing<LockPolicy::MUTEX>;
+#endif

diff --git a/src/auth/cephx/CephxClientHandler.cc b/src/auth/cephx/CephxClientHandler.cc
index 73e4c7e16d9fa10f2feaa64d0611bbfdcee16f64..3559fd7372866b281b6741507c77dd7cc8dda631 100644 (file)
--- a/src/auth/cephx/CephxClientHandler.cc
+++ b/src/auth/cephx/CephxClientHandler.cc
@@ -252,4 +252,8 @@ bool CephxClientHandler<lp>::need_tickets()
 }
 
 // explicitly instantiate only the classes we need
+#ifdef WITH_SEASTAR
+template class CephxClientHandler<LockPolicy::SINGLE>;
+#else
 template class CephxClientHandler<LockPolicy::MUTEX>;
+#endif