Merge pull request #31188 from zy751713126/rbd_features

librbd: features converting bitmask and string API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/include/rbd/librbd.h
Simple merge

diff --cc src/include/rbd/librbd.hpp
index 1164bf25939857084bc8d2cef377a461f5c6ca1b,bdc2c2384a371ad01bdd7234fc410a17af9b8f91..fb5ccf627d4d29ed275632eaa7ab8d7c85b1f814
--- 1/src/include/rbd/librbd.hpp
--- 2/src/include/rbd/librbd.hpp
+++ b/src/include/rbd/librbd.hpp
@@@ -240,9 -212,11 +240,11 @@@ public
                         const char *snapname, RBD::AioCompletion *c);
    int aio_open_by_id_read_only(IoCtx& io_ctx, Image& image, const char *id,
                                 const char *snapname, RBD::AioCompletion *c);
+   int features_to_string(uint64_t features, std::string *str_features);
+   int features_from_string(const std::string str_features, uint64_t *features);
  
    int list(IoCtx& io_ctx, std::vector<std::string>& names)
 -    __attribute__((deprecated));
 +    CEPH_RBD_DEPRECATED;
    int list2(IoCtx& io_ctx, std::vector<image_spec_t>* images);
  
    int create(IoCtx& io_ctx, const char *name, uint64_t size, int *order);

diff --cc src/librbd/librbd.cc
Simple merge

diff --cc src/pybind/rbd/rbd.pyx
Simple merge

diff --cc src/test/pybind/test_rbd.py
Simple merge