From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 8 Nov 2019 12:35:05 +0000 (-0500)
Subject: Merge pull request #31188 from zy751713126/rbd_features
X-Git-Tag: v15.1.0~991
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97db9473fc9762f2cb35a156a95816d2ecb1ceff;p=ceph.git

Merge pull request #31188 from zy751713126/rbd_features

librbd: features converting bitmask and string API

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

97db9473fc9762f2cb35a156a95816d2ecb1ceff
diff --cc src/include/rbd/librbd.hpp
index 1164bf259398,bdc2c2384a37..fb5ccf627d4d
--- a/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);