[Xen-changelog] Slight rejig avoids grant entry warning message on xm save.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 65882bf339f6607e38bca12e1cdb622419a326be
# Parent  f633c3d0315b49e41b3c6e79085fddfafb0ae2aa
Slight rejig avoids grant entry warning message on xm save.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r f633c3d0315b -r 65882bf339f6 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Sep 29 
15:25:50 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Sep 29 
15:39:32 2005
@@ -683,8 +683,6 @@
        kfree(info->backend);
        info->backend = NULL;
 
-       blkif_free(info);
-
        return 0;
 }
 
@@ -693,11 +691,12 @@
        struct blkfront_info *info = dev->data;
        int err;
 
-       /* FIXME: Check geometry hasn't changed here... */
+       blkif_free(info);
+
        err = talk_to_backend(dev, info);
-       if (!err) {
+       if (!err)
                blkif_recover(info);
-       }
+
        return err;
 }
 
diff -r f633c3d0315b -r 65882bf339f6 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Sep 29 
15:25:50 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Sep 29 
15:39:32 2005
@@ -1247,24 +1247,17 @@
 static int netfront_suspend(struct xenbus_device *dev)
 {
        struct netfront_info *info = dev->data;
-
        unregister_xenbus_watch(&info->watch);
        kfree(info->backend);
        info->backend = NULL;
-
+       return 0;
+}
+
+static int netfront_resume(struct xenbus_device *dev)
+{
+       struct netfront_info *info = dev->data;
        netif_free(info);
-
-       return 0;
-}
-
-static int netfront_resume(struct xenbus_device *dev)
-{
-       struct net_private *np = dev->data;
-       int err;
-
-       err = talk_to_backend(dev, np);
-
-       return err;
+       return talk_to_backend(dev, info);
 }
 
 static struct xenbus_driver netfront = {

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