rbd: remove unnecessary -ENOENT check for rbd cli

Signed-off-by: runsisi <runsisi@zte.com.cn>

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index 9bfb58fc588f48cc2842f556308582097b67a58e..40ebd4d99277c992f3ec2c03a5558ab07792b619 100644 (file)
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -69,9 +69,6 @@ int execute_list(const po::variables_map &vm) {
   librbd::RBD rbd;
   std::vector<std::string> names;
   r = rbd.group_list(io_ctx, &names);
-
-  if (r == -ENOENT)
-    r = 0;
   if (r < 0)
     return r;
 

diff --git a/src/tools/rbd/action/List.cc b/src/tools/rbd/action/List.cc
index 45ca812a5ae7c2957ba23f1dff2f76c2bdbdb5a9..53bebd83d8c2f802372dec646be0dcd28190a8fa 100644 (file)
--- a/src/tools/rbd/action/List.cc
+++ b/src/tools/rbd/action/List.cc
@@ -23,8 +23,6 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool lflag,
                    Formatter *f) {
   std::vector<std::string> names;
   int r = rbd.list(io_ctx, names);
-  if (r == -ENOENT)
-    r = 0;
   if (r < 0)
     return r;
 

diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
index 2c381dccc2a04d11d5cc09fc6aa1a1aaa5b0e875..47d4808d0db50754ac61024b15d3eabdd0ede1d9 100644 (file)
--- a/src/tools/rbd/action/Trash.cc
+++ b/src/tools/rbd/action/Trash.cc
@@ -160,10 +160,9 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool long_flag,
             bool all_flag, Formatter *f) {
   std::vector<librbd::trash_image_info_t> trash_entries;
   int r = rbd.trash_list(io_ctx, trash_entries);
-  if (r < 0 && r != -ENOENT) {
+  if (r < 0) {
     return r;
   }
-  r = 0;
 
   if (!long_flag) {
     if (f) {