---

yaml --- r: 373496 b: refs/heads/master c: 5655c4d h: refs/heads/master v: v3
git-mirror · May 2, 2013 · e7bc8ac · e7bc8ac
1 parent 454155b
commit e7bc8ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0fba36880288afbeca872298c970fb4abb76464
+refs/heads/master: 5655c4d940ba8dd32250ab1e4ba3db785943a28e
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -4800,16 +4800,20 @@ static int rbd_dev_probe(struct rbd_device *rbd_dev)
 		ret = rbd_dev_v1_probe(rbd_dev);
 	else
 		ret = rbd_dev_v2_probe(rbd_dev);
-	if (ret) {
-		dout("probe failed, returning %d\n", ret);
-
-		return ret;
-	}
+	if (ret)
+		goto out_err;
 
 	ret = rbd_dev_probe_finish(rbd_dev);
 	if (ret)
 		rbd_header_free(&rbd_dev->header);
 
+	return ret;
+out_err:
+	kfree(rbd_dev->spec->image_id);
+	rbd_dev->spec->image_id = NULL;
+
+	dout("probe failed, returning %d\n", ret);
+
 	return ret;
 }