Merge pull request ceph#24891 from iridescent-rsy/fix-return-value

rbd: make sure the return-value 'r' will be returned Reviewed-by: Jason Dillaman <[email protected]>
skypigltp · Nov 5, 2018 · b3fc22e · b3fc22e
2 parents e450360 + 5af59e2
commit b3fc22e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;