From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Nov 2014 22:09:28 +0000 (-0800)
Subject: librados: mark old rollback method deprecated
X-Git-Tag: v0.91~110
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1b6bcfe327dfc02db17bc13adb9afa034c98f91f;p=ceph.git

librados: mark old rollback method deprecated

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

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index dfe5b9a4109fd..03ef16537404c 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -732,7 +732,7 @@ namespace librados
 
     int snap_rollback(const std::string& oid, const char *snapname);
     // Deprecated name kept for backward compatibility - same as snap_rollback()
-    int rollback(const std::string& oid, const char *snapname);
+    int rollback(const std::string& oid, const char *snapname) __attribute__ ((deprecated));
 
     int selfmanaged_snap_create(uint64_t *snapid);
 
diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 381d59068828f..214af596b07df 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -2317,7 +2317,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
     if (!pool_name || nargs.size() < 3)
       usage_exit();
 
-    ret = io_ctx.rollback(nargs[1], nargs[2]);
+    ret = io_ctx.snap_rollback(nargs[1], nargs[2]);
     if (ret < 0) {
       cerr << "error rolling back pool " << pool_name << " to snapshot " << nargs[1]
 	   << cpp_strerror(ret) << std::endl;