import 15.2.0 Octopus source

[ceph.git] / ceph / src / cls / otp / cls_otp_client.h

diff --git a/ceph/src/cls/otp/cls_otp_client.h b/ceph/src/cls/otp/cls_otp_client.h
index f19c945911a45275b56dd83fffb3b4a7fc7c7262..f1dec9f5681f2b1e9a13cb7e07df6636603f2eb5 100644 (file)
--- a/ceph/src/cls/otp/cls_otp_client.h
+++ b/ceph/src/cls/otp/cls_otp_client.h
@@ -16,19 +16,23 @@ namespace rados {
         static void create(librados::ObjectWriteOperation *op, const otp_info_t& config);
         static void set(librados::ObjectWriteOperation *op, const list<otp_info_t>& entries);
         static void remove(librados::ObjectWriteOperation *op, const string& id);
-        static int get(librados::ObjectReadOperation *op,
-                       librados::IoCtx& ioctx, const string& oid,
-                       const list<string> *ids, bool get_all, list<otp_info_t> *result);
         static int get(librados::ObjectReadOperation *op,
                        librados::IoCtx& ioctx, const string& oid,
                        const string& id, otp_info_t *result);
         static int get_all(librados::ObjectReadOperation *op,
                            librados::IoCtx& ioctx, const string& oid,
                            list<otp_info_t> *result);
+// these overloads which call io_ctx.operate() or io_ctx.exec() should not be called in the rgw.
+// rgw_rados_operate() should be called after the overloads w/o calls to io_ctx.operate()/exec()
+#ifndef CLS_CLIENT_HIDE_IOCTX
+        static int get(librados::ObjectReadOperation *op,
+                       librados::IoCtx& ioctx, const string& oid,
+                       const list<string> *ids, bool get_all, list<otp_info_t> *result);
         static int check(CephContext *cct, librados::IoCtx& ioctx, const string& oid,
                          const string& id, const string& val, otp_check_t *result);
         static int get_current_time(librados::IoCtx& ioctx, const string& oid,
                                     ceph::real_time *result);
+#endif
       };
 
       class TOTPConfig {