From 6d991c5c51636e3d938952de6bbcb66874343c6b Mon Sep 17 00:00:00 2001
From: runsisi <runsisi@zte.com.cn>
Date: Wed, 17 May 2017 19:58:19 +0800
Subject: [PATCH] rbd: remove unnecessary -ENOENT check for rbd cli

Signed-off-by: runsisi <runsisi@zte.com.cn>
---
 src/tools/rbd/action/Group.cc | 3 ---
 src/tools/rbd/action/List.cc  | 2 --
 src/tools/rbd/action/Trash.cc | 3 +--
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index 9bfb58fc588f..40ebd4d99277 100644
--- 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 45ca812a5ae7..53bebd83d8c2 100644
--- 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 2c381dccc2a0..47d4808d0db5 100644
--- 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) {
-- 
2.47.3