ports/net/ceph14/files/patch-src_tools_rbd_action_Trash.cc
Dima Panov 9a397d866e net/ceph14: update to 14.2.22 release
Add missed patches.
this is a followup to 30f5003a33
2021-12-05 21:13:23 +03:00

22 lines
829 B
C++

diff --git src/tools/rbd/action/Trash.cc src/tools/rbd/action/Trash.cc
index c4a17e4134..8b8fd8a322 100644
--- src/tools/rbd/action/Trash.cc
+++ src/tools/rbd/action/Trash.cc
@@ -12,6 +12,7 @@
*
*/
+#include "include/compat.h"
#include "tools/rbd/ArgumentTypes.h"
#include "tools/rbd/Shell.h"
#include "tools/rbd/Utils.h"
@@ -145,9 +146,6 @@ int execute_remove(const po::variables_map &vm,
std::cerr << "rbd: image has snapshots - these must be deleted"
<< " with 'rbd snap purge' before the image can be removed."
<< std::endl;
- } else if (r == -EUCLEAN) {
- std::cerr << "rbd: error: image not fully moved to trash."
- << std::endl;
} else if (r == -EBUSY) {
std::cerr << "rbd: error: image still has watchers"
<< std::endl