]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: complete progress for import-diff from stdin
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 29 Mar 2013 23:44:50 +0000 (16:44 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 1 Apr 2013 06:32:42 +0000 (23:32 -0700)
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>
src/rbd.cc

index e35ce7c2dfac71ada01981b353bece483547c74c..f3158396f2aa819abd020933934dc96756c24ff9 100644 (file)
@@ -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;
 }