From: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
Date: Fri, 2 Nov 2018 05:44:57 +0000 (+0800)
Subject: rbd: make sure the return-value 'r' will be returned.
X-Git-Tag: v14.1.0~1004^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24891%2Fhead;p=ceph.git

rbd: make sure the return-value 'r' will be returned.

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
---

diff --git a/src/tools/rbd/action/DiskUsage.cc b/src/tools/rbd/action/DiskUsage.cc
index 57447cd9f612..abc9cf418626 100644
--- a/src/tools/rbd/action/DiskUsage.cc
+++ b/src/tools/rbd/action/DiskUsage.cc
@@ -132,7 +132,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
     }
 
     uint64_t features;
-    int r = image.features(&features);
+    r = image.features(&features);
     if (r < 0) {
       std::cerr << "rbd: failed to retrieve image features: " << cpp_strerror(r)
                 << std::endl;