From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 29 Mar 2013 23:44:50 +0000 (-0700)
Subject: rbd: complete progress for import-diff from stdin
X-Git-Tag: v0.62~118^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09898ffdd942215e939df50e862e0f49be856c3a;p=ceph.git

rbd: complete progress for import-diff from stdin

The diff format gives us a size, so unlike a normal import, we do update progress.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index e35ce7c2dfac..f3158396f2aa 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -1505,13 +1505,12 @@ static int do_import_diff(librbd::Image &image, const char *path)
   }
 
  done:
-  if (!from_stdin) {
-    if (r < 0)
-      pc.fail();
-    else
-      pc.finish();
+  if (r < 0)
+    pc.fail();
+  else
+    pc.finish();
+  if (!from_stdin)
     close(fd);
-  }
   return r;
 }