From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 11 Jan 2016 10:29:01 +0000 (+0800)
Subject: RBD: remove redundant parent check
X-Git-Tag: v10.0.3~60^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7174%2Fhead;p=ceph.git

RBD: remove redundant parent check

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 958be93de5cf..c31da2e9ba2a 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;
       }