librbd: no need to scan snapshots for parents during remove

At this point we already know no snapshots exist.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 6bf613cc3620f85f96b05972f48a8a2f2503c998..cd974ea5e42c2e74a861bb8ab4e52eb5c8f41475 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1213,13 +1213,11 @@ reprotect_and_return_err:
       parent_info parent_info = ictx->parent_md;
       ictx->parent_lock.Unlock();
 
-      if (scan_for_parents(ictx, parent_info.spec, CEPH_NOSNAP) == -ENOENT) {
-       r = cls_client::remove_child(&ictx->md_ctx, RBD_CHILDREN,
-                                    parent_info.spec, id);
-       if (r < 0 && r != -ENOENT) {
-         lderr(cct) << "error removing child from children list" << dendl;
-         return r;
-       }
+      r = cls_client::remove_child(&ictx->md_ctx, RBD_CHILDREN,
+                                  parent_info.spec, id);
+      if (r < 0 && r != -ENOENT) {
+       lderr(cct) << "error removing child from children list" << dendl;
+       return r;
       }
       close_image(ictx);