update sources to v12.1.0

[ceph.git] / ceph / src / tools / rbd / action / Trash.cc

diff --git a/ceph/src/tools/rbd/action/Trash.cc b/ceph/src/tools/rbd/action/Trash.cc
index 2c381dccc2a04d11d5cc09fc6aa1a1aaa5b0e875..47d4808d0db50754ac61024b15d3eabdd0ede1d9 100644 (file)
--- a/ceph/src/tools/rbd/action/Trash.cc
+++ b/ceph/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) {