From 2f1720d08005c7b48511c0506f83a3112d36605d Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Tue, 3 Jan 2012 17:11:28 -0800
Subject: [PATCH] librados: return int64_t pool ids

468e28ee60ee2fe625d2680c792a4bcb9ef19951 missed the get_id() functions.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
---
 src/include/rados/librados.h   | 2 +-
 src/include/rados/librados.hpp | 2 +-
 src/librados.cc                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 843cad36d087d..addfb622a8db0 100644
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -143,7 +143,7 @@ int rados_ioctx_pool_set_auid(rados_ioctx_t io, uint64_t auid);
 int rados_ioctx_pool_get_auid(rados_ioctx_t io, uint64_t *auid);
 
 void rados_ioctx_locator_set_key(rados_ioctx_t io, const char *key);
-int rados_ioctx_get_id(rados_ioctx_t io);
+int64_t rados_ioctx_get_id(rados_ioctx_t io);
 
 /* objects */
 int rados_objects_list_open(rados_ioctx_t io, rados_list_ctx_t *ctx);
diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index be1298e4021c6..03c8580b2919d 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -324,7 +324,7 @@ namespace librados
 
     void locator_set_key(const std::string& key);
 
-    int get_id();
+    int64_t get_id();
 
     CephContext *cct();
 
diff --git a/src/librados.cc b/src/librados.cc
index 8e29fd20b055f..8323b2081f7c1 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -128,7 +128,7 @@ struct librados::IoCtxImpl {
   void complete_aio_write(struct AioCompletionImpl *c);
   void flush_aio_writes();
 
-  int get_id() {
+  int64_t get_id() {
     return poolid;
   }
 };
@@ -3114,7 +3114,7 @@ void librados::IoCtx::locator_set_key(const string& key)
   io_ctx_impl->oloc.key = key;
 }
 
-int librados::IoCtx::get_id()
+int64_t librados::IoCtx::get_id()
 {
   return io_ctx_impl->get_id();
 }
@@ -3734,7 +3734,7 @@ extern "C" void rados_ioctx_locator_set_key(rados_ioctx_t io, const char *key)
     ctx->oloc.key = "";
 }
 
-extern "C" int rados_ioctx_get_id(rados_ioctx_t io)
+extern "C" int64_t rados_ioctx_get_id(rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   return ctx->get_id();
-- 
2.39.5