---

yaml --- r: 373515 b: refs/heads/master c: 2e93bf9 h: refs/heads/master i: 373513: df26340 373511: 1af0731 v: v3
git-mirror · May 2, 2013 · 86c1088 · 86c1088
1 parent 8bc5472
commit 86c1088
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad945fc1da42965a31089d29de3754047861f348
+refs/heads/master: 2e93bf9e465b7d0ccf703fb791c663435d9522cf
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -4813,8 +4813,7 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
 	return ret;
 
 err_out_bus:
-	/* this will also clean up rest of rbd_dev stuff */
-
+	rbd_dev_remove_parent(rbd_dev);
 	rbd_bus_del_dev(rbd_dev);
 
 	return ret;
@@ -4931,7 +4930,6 @@ static ssize_t rbd_add(struct bus_type *bus,
 
 	return count;
 err_out_rbd_dev:
-	rbd_spec_put(rbd_dev->parent_spec);
 	kfree(rbd_dev->header_name);
 	rbd_dev_destroy(rbd_dev);
 err_out_client: