From b1fde7e9594cfb194812d21920a19bc82905c4ff Mon Sep 17 00:00:00 2001 From: songweibin Date: Tue, 28 Aug 2018 16:37:46 +0800 Subject: [PATCH] rbd: correct parameter of namespace which cannot be recognized Signed-off-by: songweibin --- src/tools/rbd/action/Group.cc | 2 +- src/tools/rbd/action/List.cc | 2 +- src/tools/rbd/action/Trash.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc index e4236c3aa517d..4c288e8dd774d 100644 --- a/src/tools/rbd/action/Group.cc +++ b/src/tools/rbd/action/Group.cc @@ -123,7 +123,7 @@ int execute_list(const po::variables_map &vm, size_t arg_index = 0; std::string pool_name = utils::get_pool_name(vm, &arg_index); - std::string namespace_name = utils::get_namespace_name(vm, nullptr); + std::string namespace_name = utils::get_namespace_name(vm, &arg_index); at::Format::Formatter formatter; int r = utils::get_formatter(vm, &formatter); diff --git a/src/tools/rbd/action/List.cc b/src/tools/rbd/action/List.cc index ce67396b6946f..d4b3a2c28644b 100644 --- a/src/tools/rbd/action/List.cc +++ b/src/tools/rbd/action/List.cc @@ -293,7 +293,7 @@ int execute(const po::variables_map &vm, const std::vector &ceph_global_init_args) { size_t arg_index = 0; std::string pool_name = utils::get_pool_name(vm, &arg_index); - std::string namespace_name = utils::get_namespace_name(vm, nullptr); + std::string namespace_name = utils::get_namespace_name(vm, &arg_index); at::Format::Formatter formatter; int r = utils::get_formatter(vm, &formatter); diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc index d78796de88941..3533157294c69 100644 --- a/src/tools/rbd/action/Trash.cc +++ b/src/tools/rbd/action/Trash.cc @@ -341,7 +341,7 @@ int execute_list(const po::variables_map &vm, const std::vector &ceph_global_init_args) { size_t arg_index = 0; std::string pool_name = utils::get_pool_name(vm, &arg_index); - std::string namespace_name = utils::get_namespace_name(vm, nullptr); + std::string namespace_name = utils::get_namespace_name(vm, &arg_index); at::Format::Formatter formatter; int r = utils::get_formatter(vm, &formatter); @@ -389,7 +389,7 @@ int execute_purge (const po::variables_map &vm, const std::vector &ceph_global_init_args) { size_t arg_index = 0; std::string pool_name = utils::get_pool_name(vm, &arg_index); - std::string namespace_name = utils::get_namespace_name(vm, nullptr); + std::string namespace_name = utils::get_namespace_name(vm, &arg_index); librados::Rados rados; librados::IoCtx io_ctx; -- 2.39.5