From: xiexingguo <258156334@qq.com>
Date: Thu, 26 Nov 2015 02:00:59 +0000 (+0800)
Subject: DiskUsage: close formatter session on error exit
X-Git-Tag: v10.0.2~153^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75f1412b04baea858cbadceb70c2adfdb8120652;p=ceph.git

DiskUsage: close formatter session on error exit

Fixes: #13711
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/tools/rbd/action/DiskUsage.cc b/src/tools/rbd/action/DiskUsage.cc
index 8e59ffeff807..580192feeed2 100644
--- a/src/tools/rbd/action/DiskUsage.cc
+++ b/src/tools/rbd/action/DiskUsage.cc
@@ -131,7 +131,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
     if (r < 0) {
       std::cerr << "rbd: failed to retrieve image features: " << cpp_strerror(r)
                 << std::endl;
-      return r;
+      goto out;
     }
     if ((features & RBD_FEATURE_FAST_DIFF) == 0) {
       std::cerr << "warning: fast-diff map is not enabled for " << *name << ". "
@@ -140,7 +140,8 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
 
     librbd::image_info_t info;
     if (image.stat(info, sizeof(info)) < 0) {
-      return -EINVAL;
+      r = -EINVAL;
+      goto out;
     }
 
     std::vector<librbd::snap_info_t> snap_list;
@@ -163,7 +164,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
       if (r < 0) {
         std::cerr << "rbd: error opening snapshot " << *name << "@"
                   << snap->name << ": " << cpp_strerror(r) << std::endl;
-        return r;
+        goto out;
       }
 
       if (imgname == NULL || (snapname != NULL && snap->name == snapname)) {
@@ -171,7 +172,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
                                      snap_image, snap->size, tbl, f,
                                      &used_size);
         if (r < 0) {
-          return r;
+          goto out;
         }
 
         if (snapname != NULL) {
@@ -186,13 +187,14 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
       r = compute_image_disk_usage(*name, "", last_snap_name, image, info.size,
                                    tbl, f, &used_size);
       if (r < 0) {
-        return r;
+        goto out;
       }
       total_prov += info.size;
       total_used += used_size;
     }
   }
 
+out:
   if (f) {
     f->close_section();
     if (imgname == NULL) {
@@ -211,7 +213,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx,
     std::cout << tbl;
   }
 
-  return 0;
+  return r < 0 ? r : 0;
 }
 
 void get_arguments(po::options_description *positional,