Attachment 159105 Details for Bug 248024 – Backported XS patch for RH's RHEL4.6

[patch] Backported XS patch for RH's RHEL4.6

xenpv-partition-synch.patch (text/plain), 2.21 KB, created by Don Dutile (Red Hat) on 2007-07-12 22:27:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Dutile (Red Hat)

Created: 2007-07-12 22:27:08 UTC

Size: 2.21 KB

patch

obsolete

>--- linux-2.6.9/include/xen/xenbus.h.orig	2007-07-12 13:53:31.000000000 -0400
>+++ linux-2.6.9/include/xen/xenbus.h	2007-07-12 13:53:57.000000000 -0400
>@@ -105,6 +105,7 @@
> 	int (*uevent)(struct xenbus_device *, char **, int, char *, int);
> 	struct device_driver driver;
> 	int (*read_otherend_details)(struct xenbus_device *dev);
>+	int (*is_ready)(struct xenbus_device *dev);
> };
> 
> static inline struct xenbus_driver *to_xenbus_driver(struct device_driver *drv)
>--- linux-2.6.9/drivers/xen/xenbus/xenbus_probe.c.orig	2007-07-12 13:15:36.000000000 -0400
>+++ linux-2.6.9/drivers/xen/xenbus/xenbus_probe.c	2007-07-12 13:52:49.000000000 -0400
>@@ -1162,6 +1162,7 @@
> {
> 	struct xenbus_device *xendev = to_xenbus_device(dev);
> 	struct device_driver *drv = data;
>+	struct xenbus_driver *xendrv;
> 
> 	/*
> 	 * A device with no driver will never connect. We care only about
>@@ -1174,7 +1175,9 @@
> 	if (drv && (dev->driver != drv))
> 		return 0;
> 
>-	return (xendev->state != XenbusStateConnected);
>+	xendrv = to_xenbus_driver(dev->driver);
>+	return (xendev->state != XenbusStateConnected ||
>+		(xendrv->is_ready && !xendrv->is_ready(xendev)));
> }
> 
> static int exists_disconnected_device(struct device_driver *drv)
>--- linux-2.6.9/drivers/xen/blkfront/blkfront.c.orig	2007-07-12 13:14:51.000000000 -0400
>+++ linux-2.6.9/drivers/xen/blkfront/blkfront.c	2007-07-12 15:00:37.000000000 -0400
>@@ -333,6 +333,8 @@
> 	spin_unlock_irq(&blkif_io_lock);
> 
> 	add_disk(info->gd);
>+
>+	info->is_ready = 1;
> }
> 
> /**
>@@ -815,6 +817,12 @@
> 	spin_unlock_irq(&blkif_io_lock);
> }
> 
>+int blkfront_is_ready(struct xenbus_device *dev)
>+{
>+	struct blkfront_info *info = dev->data;
>+
>+	return info->is_ready;
>+}
> 
> /* ** Driver Registration ** */
> 
>@@ -833,6 +841,7 @@
> 	.remove = blkfront_remove,
> 	.resume = blkfront_resume,
> 	.otherend_changed = backend_changed,
>+	.is_ready = blkfront_is_ready,
> };
> 
> 
>--- linux-2.6.9/drivers/xen/blkfront/block.h.orig	2007-07-12 13:15:16.000000000 -0400
>+++ linux-2.6.9/drivers/xen/blkfront/block.h	2007-07-12 13:50:55.000000000 -0400
>@@ -126,6 +126,7 @@
> 	struct gnttab_free_callback callback;
> 	struct blk_shadow shadow[BLK_RING_SIZE];
> 	unsigned long shadow_free;
>+	int is_ready;
> 
> 	/**
> 	 * The number of people holding this device open.  We won't allow a

Actions: View | Diff

Attachments on bug 248024: 159105