---

yaml --- r: 347594 b: refs/heads/master c: 2c0d0a1 h: refs/heads/master v: v3
git-mirror · Nov 1, 2012 · 239d7aa · 239d7aa
1 parent 26fa592
commit 239d7aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a06263625b823afa3a842ddbf53473c22f24b2
+refs/heads/master: 2c0d0a10ea89456781218f458f6bf72e99d87d2a
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -3067,6 +3067,14 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 	void *response;
 	void *p;
 
+	/*
+	 * When probing a parent image, the image id is already
+	 * known (and the image name likely is not).  There's no
+	 * need to fetch the image id again in this case.
+	 */
+	if (rbd_dev->spec->image_id)
+		return 0;
+
 	/*
 	 * First, see if the format 2 image id file exists, and if
 	 * so, get the image's persistent id from it.