librados: remove new setxattr overload to avoid breaking the C++ ABI

Fixes: http://tracker.ceph.com/issues/18058
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit b8ff781ddcf737882163cf56d7c9b11e815fb699)

Conflicts:
	src/include/rados/librados.hpp (trivial namespace change in removed line)

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index f33a1435cdaf6256d151b5cb1839ff6daf696b2d..8450f22a033e46f002159bb10e4113ee2922dfe2 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -375,7 +375,6 @@ namespace librados
     void zero(uint64_t off, uint64_t len);
     void rmxattr(const char *name);
     void setxattr(const char *name, const bufferlist& bl);
-    void setxattr(const char *name, const buffer::list&& bl);
     void tmap_update(const bufferlist& cmdbl);
     void tmap_put(const bufferlist& bl);
     void clone_range(uint64_t dst_off,

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index 3db601bb6d0104eaa2a561e47693e270942ba42c..05dfac509f712710513f5aaddc8452668caae07f 100644 (file)
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -437,14 +437,6 @@ void librados::ObjectWriteOperation::setxattr(const char *name, const bufferlist
   o->setxattr(name, v);
 }
 
-void librados::ObjectWriteOperation::setxattr(const char *name,
-                                             const buffer::list&& v)
-{
-  ::ObjectOperation *o = &impl->o;
-  o->setxattr(name, std::move(v));
-}
-
-
 void librados::ObjectWriteOperation::omap_set(
   const map<string, bufferlist> &map)
 {