From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Fri, 29 Jul 2016 02:24:54 +0000 (-0400)
Subject: rbd: finish the pc in importing even if from_stdin.
X-Git-Tag: v12.0.1~342^2~22
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4658cf1c61338b9ddf653545781ea1d47320b61b;p=ceph-ci.git

rbd: finish the pc in importing even if from_stdin.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
---

diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index 5b99e77d507..0a01411de93 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -205,13 +205,11 @@ err:
   if (r < 0)
     rbd.remove(io_ctx, imgname);
 done:
-  if (!from_stdin) {
-    if (r < 0)
-      pc.fail();
-    else
-      pc.finish();
-    close(fd);
-  }
+  if (r < 0)
+    pc.fail();
+  else
+    pc.finish();
+  close(fd);
 done2:
   delete[] p;
   return r;