update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / librbd / trash / MoveRequest.cc

diff --git a/ceph/src/librbd/trash/MoveRequest.cc b/ceph/src/librbd/trash/MoveRequest.cc
index 82b81fa3863b8fed32e0e5600bba58f278c98e3e..7b7abe452fbd5fa25da7c1a72e0f5e6853f23643 100644 (file)
--- a/ceph/src/librbd/trash/MoveRequest.cc
+++ b/ceph/src/librbd/trash/MoveRequest.cc
@@ -101,7 +101,10 @@ template <typename I>
 void MoveRequest<I>::handle_directory_remove(int r) {
   ldout(m_cct, 10) << "r=" << r << dendl;
 
-  if (r < 0 && r != -ENOENT) {
+  if (r == -ENOENT) {
+    r = 0;
+  }
+  if (r < 0) {
     lderr(m_cct) << "failed to remove image from directory: " << cpp_strerror(r)
                  << dendl;
   }