From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Tue, 11 Oct 2016 10:54:14 +0000 (-0400)
Subject: rbd: move do_import_diff out from namespace of import_diff
X-Git-Tag: v12.0.1~342^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de671d77a1b3592278d2826c6cf97867e9a5242b;p=ceph.git

rbd: move do_import_diff out from namespace of import_diff

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 237bb88424dd..d1e1ac0528a4 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -19,13 +19,9 @@
 
 namespace rbd {
 namespace action {
-namespace import_diff {
 
-namespace at = argument_types;
-namespace po = boost::program_options;
-
-static int do_import_diff(librbd::Image &image, const char *path,
-                          bool no_progress)
+int do_import_diff(librbd::Image &image, const char *path,
+                bool no_progress)
 {
   int fd, r;
   struct stat stat_buf;
@@ -177,6 +173,11 @@ static int do_import_diff(librbd::Image &image, const char *path,
   return r;
 }
 
+namespace import_diff {
+
+namespace at = argument_types;
+namespace po = boost::program_options;
+
 void get_arguments(po::options_description *positional,
                    po::options_description *options) {
   at::add_path_options(positional, options,