---

yaml --- r: 373529 b: refs/heads/master c: 96882f5 h: refs/heads/master i: 373527: e51f797 v: v3
git-mirror · May 2, 2013 · 920fa32 · 920fa32
1 parent 90baad8
commit 920fa32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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 */