WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Minor cleanups.

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 9fb0bad776dd3d1c1cd5eec4990a296fbe0e38dc
# Parent  b4b3f6be5226adfb127bc32fd5cca27f2ed473f7
Minor cleanups.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r b4b3f6be5226 -r 9fb0bad776dd 
linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Thu Aug 25 
17:27:49 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Thu Aug 25 
18:49:48 2005
@@ -124,6 +124,7 @@
     if (blkif->blk_ring.sring) {
        unmap_frontend_page(blkif);
        vfree(blkif->blk_ring.sring);
+       blkif->blk_ring.sring = NULL;
     }
 
     kmem_cache_free(blkif_cachep, blkif);
diff -r b4b3f6be5226 -r 9fb0bad776dd 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Aug 25 
17:27:49 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Aug 25 
18:49:48 2005
@@ -1258,6 +1258,7 @@
        err = talk_to_backend(dev, info);
        if (err) {
                kfree(info);
+               dev->data = NULL;
                return err;
        }
 
diff -r b4b3f6be5226 -r 9fb0bad776dd 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Aug 25 
17:27:49 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Aug 25 
18:49:48 2005
@@ -939,18 +939,12 @@
 
 static int destroy_netdev(struct net_device *netdev)
 {
-       struct net_private *np = NULL;
 
 #ifdef CONFIG_PROC_FS
        xennet_proc_delif(netdev);
 #endif
 
         unregister_netdev(netdev);
-
-       np = netdev_priv(netdev);
-       list_del(&np->list);
-
-       kfree(netdev);
 
        return 0;
 }
@@ -1244,11 +1238,16 @@
        }
 
        info = netdev_priv(netdev);
+       dev->data = info;
+
        err = talk_to_backend(dev, info);
        if (err) {
                destroy_netdev(netdev);
+               kfree(netdev);
+               dev->data = NULL;
                return err;
        }
+
 
        /* Call once in case entries already there. */
        watch_for_status(&info->watch, info->watch.node);

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Minor cleanups., Xen patchbot -unstable <=