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 237bb88424dd436dcb832717c28c69b1b10f79a3..d1e1ac0528a439ba22e7e053bec1521df8ac3059 100644 (file)
--- 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,