From 95f1035275f2a2b1038459a519bcb3d3e5e30ba5 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Mon, 11 Jan 2016 18:29:01 +0800 Subject: [PATCH] RBD: remove redundant parent check Signed-off-by: xie xingguo --- src/librbd/internal.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 958be93de5cf8..c31da2e9ba2ad 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1950,13 +1950,11 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) { parent_spec parent_spec; if (ictx->snap_id == CEPH_NOSNAP) { - if (!ictx->parent) - return -ENOENT; parent_spec = ictx->parent_md.spec; } else { r = ictx->get_parent_spec(ictx->snap_id, &parent_spec); if (r < 0) { - lderr(ictx->cct) << "Can't find snapshot id" << ictx->snap_id << dendl; + lderr(ictx->cct) << "Can't find snapshot id = " << ictx->snap_id << dendl; return r; } if (parent_spec.pool_id == -1) @@ -1967,7 +1965,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) { r = rados.pool_reverse_lookup(parent_spec.pool_id, parent_pool_name); if (r < 0) { - lderr(ictx->cct) << "error looking up pool name" << cpp_strerror(r) + lderr(ictx->cct) << "error looking up pool name: " << cpp_strerror(r) << dendl; return r; } -- 2.39.5