[Xen-changelog] Free blkif if vbd_create fails.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID feff6bf0417ec3b6c7615fd47ac9c0085873fd15
# Parent  3a34bcb7c28b49877bbcf31fa3985ecb5651eae2
Free blkif if vbd_create fails.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 3a34bcb7c28b -r feff6bf0417e 
linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Tue Sep 13 19:09:44 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Tue Sep 13 19:43:58 2005
@@ -170,7 +170,6 @@
 
                be->blkif = alloc_blkif(be->frontend_id);
                if (IS_ERR(be->blkif)) {
-                        /* XXX SMH: should free blkif here... hmm */
                        err = PTR_ERR(be->blkif);
                        be->blkif = NULL;
                        xenbus_dev_error(dev, err, "creating block interface");
@@ -179,8 +178,8 @@
 
                err = vbd_create(be->blkif, handle, be->pdev, be->readonly);
                if (err) {
-                        /* XXX SMH: should free blkif here too... */
-                        be->blkif = NULL; 
+                       blkif_put(be->blkif);
+                       be->blkif = NULL;
                        xenbus_dev_error(dev, err, "creating vbd structure");
                        return;
                }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog