]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
librbd: fix rbd_features_to_string output
authorzhengyin <zhengyin@cmss.chinamobile.com>
Mon, 21 Oct 2019 06:32:24 +0000 (14:32 +0800)
committerzhengyin <zhengyin@cmss.chinamobile.com>
Mon, 21 Oct 2019 09:59:56 +0000 (17:59 +0800)
if features = 61, it will output ",deep-flattenexclusive-lockfast-difflayeringobject-map".
I think "deep-flatten,exclusive-lock,fast-diff,layering,object-map" is suitable output.

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
src/librbd/Features.cc

index 8623adb4ee343827fc1329a3484aaead952b589a..a2c25169c432b91bc0f2c4f541ea21666b5a70c5 100644 (file)
@@ -34,8 +34,8 @@ std::string rbd_features_to_string(uint64_t features,
   std::string r;
   for (auto& i : RBD_FEATURE_MAP) {
     if (features & i.second) {
-      if (r.empty()) {
-       r += ",";
+      if (!r.empty()) {
+      r += ",";
       }
       r += i.first;
       features &= ~i.second;