From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Jan 2017 23:17:27 +0000 (-0500)
Subject: librados: keep v1 stubs to preserve ABI
X-Git-Tag: v12.0.1~413^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b13d6d03f2c7bd664785fcce410e502be70cb0a9;p=ceph.git

librados: keep v1 stubs to preserve ABI

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 9f6f343c35e..9d02093a2df 100644
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -3450,6 +3450,25 @@ CEPH_RADOS_API int rados_monitor_log(rados_t cluster, const char *level,
 
 /** @} Mon/OSD/PG commands */
 
+/*
+ * These methods are no longer supported and return -ENOTSUP where possible.
+ */
+CEPH_RADOS_API int rados_objects_list_open(
+  rados_ioctx_t io,
+  rados_list_ctx_t *ctx) __attribute__((deprecated));
+CEPH_RADOS_API uint32_t rados_objects_list_get_pg_hash_position(
+  rados_list_ctx_t ctx) __attribute__((deprecated));
+CEPH_RADOS_API uint32_t rados_objects_list_seek(
+  rados_list_ctx_t ctx,
+  uint32_t pos) __attribute__((deprecated));
+CEPH_RADOS_API int rados_objects_list_next(
+  rados_list_ctx_t ctx,
+  const char **entry,
+  const char **key) __attribute__((deprecated));
+CEPH_RADOS_API void rados_objects_list_close(
+  rados_list_ctx_t ctx) __attribute__((deprecated));
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index ad25a518d85..618c7683cb7 100644
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -4201,6 +4201,45 @@ extern "C" int rados_nobjects_list_next(rados_list_ctx_t listctx, const char **e
 }
 
 
+/*
+ * removed legacy v2 list objects stubs
+ *
+ * thse return -ENOTSUP where possible.
+ */
+extern "C" int rados_objects_list_open(
+  rados_ioctx_t io,
+  rados_list_ctx_t *ctx)
+{
+  return -ENOTSUP;
+}
+
+extern "C" uint32_t rados_objects_list_get_pg_hash_position(
+  rados_list_ctx_t ctx)
+{
+  return 0;
+}
+
+extern "C" uint32_t rados_objects_list_seek(
+  rados_list_ctx_t ctx,
+  uint32_t pos)
+{
+  return 0;
+}
+
+extern "C" int rados_objects_list_next(
+  rados_list_ctx_t ctx,
+  const char **entry,
+  const char **key)
+{
+  return -ENOTSUP;
+}
+
+extern "C" void rados_objects_list_close(
+  rados_list_ctx_t ctx)
+{
+}
+
+
 // -------------------------
 // aio