From 920fa32309228f756016952d1c2046d4a6f4da68 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Tue, 30 Apr 2013 00:44:32 -0500
Subject: [PATCH] --- yaml --- r: 373529 b: refs/heads/master c:
 96882f55c40dcb4cd80b81a4374fdd297109ec98 h: refs/heads/master i:   373527:
 e51f7972c4622d4ae1474045143ce0193db1155f v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/rbd.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b2b7ae6feed..0d454b6dc2da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 812164f8c3f6f5348aa69003a2f81775c2872ac0
+refs/heads/master: 96882f55c40dcb4cd80b81a4374fdd297109ec98
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 5c1c38dc0b51..71e2de2cff22 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -4624,8 +4624,15 @@ static int rbd_dev_v2_probe(struct rbd_device *rbd_dev)
 		ret = rbd_dev_v2_parent_info(rbd_dev);
 		if (ret)
 			goto out_err;
-		rbd_warn(rbd_dev, "WARNING: kernel support for "
-					"layered rbd images is EXPERIMENTAL!");
+
+		/*
+		 * Don't print a warning for parent images.  We can
+		 * tell this point because we won't know its pool
+		 * name yet (just its pool id).
+		 */
+		if (rbd_dev->spec->pool_name)
+			rbd_warn(rbd_dev, "WARNING: kernel layering "
+					"is EXPERIMENTAL!");
 	}
 
 	/* If the image supports fancy striping, get its parameters */