From: zhengyin <zhengyin@cmss.chinamobile.com>
Date: Mon, 21 Oct 2019 06:32:24 +0000 (+0800)
Subject: librbd: fix rbd_features_to_string output
X-Git-Tag: v15.1.0~1163^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2deb39cb5b98b0296b0309b05d19c2b7f8270db0;p=ceph-ci.git

librbd: fix rbd_features_to_string output

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>
---

diff --git a/src/librbd/Features.cc b/src/librbd/Features.cc
index 8623adb4ee3..a2c25169c43 100644
--- a/src/librbd/Features.cc
+++ b/src/librbd/Features.cc
@@ -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;