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

List: 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/List.cc b/src/tools/rbd/action/List.cc
index 6b2041ac204a..080d8f419bb6 100644
--- a/src/tools/rbd/action/List.cc
+++ b/src/tools/rbd/action/List.cc
@@ -83,15 +83,17 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
     parent.clear();
     r = im.parent_info(&pool, &image, &snap);
     if (r < 0 && r != -ENOENT)
-      return r;
+      goto out;
     bool has_parent = false;
     if (r != -ENOENT) {
       parent = pool + "/" + image + "@" + snap;
       has_parent = true;
     }
 
-    if (im.stat(info, sizeof(info)) < 0)
-      return -EINVAL;
+    if (im.stat(info, sizeof(info)) < 0) {
+      r = -EINVAL;
+      goto out;
+    }
 
     uint8_t old_format;
     im.old_format(&old_format);
@@ -100,7 +102,7 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
     bool exclusive;
     r = im.list_lockers(&lockers, &exclusive, NULL);
     if (r < 0)
-      return r;
+      goto out;
     std::string lockstr;
     if (!lockers.empty()) {
       lockstr = (exclusive) ? "excl" : "shr";
@@ -141,7 +143,7 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
         im.snap_set(s->name.c_str());
         r = im.snap_is_protected(s->name.c_str(), &is_protected);
         if (r < 0)
-          return r;
+          goto out;
         if (im.parent_info(&pool, &image, &snap) >= 0) {
           parent = pool + "/" + image + "@" + snap;
           has_parent = true;
@@ -173,6 +175,8 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
       }
     }
   }
+
+out:
   if (f) {
     f->close_section();
     f->flush(std::cout);
@@ -180,7 +184,7 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
     std::cout << tbl;
   }
 
-  return 0;
+  return r < 0 ? r : 0;
 }
 
 void get_arguments(po::options_description *positional,