Attachment 159140 Details for Bug 247265 – Upstream patch against 2.6.20-2925.10

[patch] Upstream patch against 2.6.20-2925.10

blkfront_is_ready.patch (text/plain), 3.22 KB, created by Richard W.M. Jones on 2007-07-13 09:05:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2007-07-13 09:05:09 UTC

Size: 3.22 KB

patch

obsolete

>diff -ur kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/blkfront/blkfront.c kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront/blkfront.c
>--- kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/blkfront/blkfront.c	2007-07-12 13:42:47.000000000 +0100
>+++ kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront/blkfront.c	2007-07-12 13:44:06.000000000 +0100
>@@ -343,6 +343,8 @@
> 	spin_unlock_irq(&blkif_io_lock);
> 
> 	add_disk(info->gd);
>+
>+	info->is_ready = 1;
> }
> 
> /**
>@@ -852,6 +854,13 @@
> 	spin_unlock_irq(&blkif_io_lock);
> }
> 
>+int blkfront_is_ready(struct xenbus_device *dev)
>+{
>+	struct blkfront_info *info = dev->dev.driver_data;
>+
>+	return info->is_ready;
>+}
>+
> 
> /* ** Driver Registration ** */
> 
>@@ -870,6 +879,7 @@
> 	.remove = blkfront_remove,
> 	.resume = blkfront_resume,
> 	.otherend_changed = backend_changed,
>+	.is_ready = blkfront_is_ready,
> };
> 
> 
>Only in kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront: blkfront.c.orig
>diff -ur kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/blkfront/block.h kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront/block.h
>--- kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/blkfront/block.h	2007-07-12 13:42:47.000000000 +0100
>+++ kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront/block.h	2007-07-12 13:44:06.000000000 +0100
>@@ -125,6 +125,7 @@
> 	struct blk_shadow shadow[BLK_RING_SIZE];
> 	unsigned long shadow_free;
> 	int feature_barrier;
>+	int is_ready;
> 
> 	/**
> 	 * The number of people holding this device open.  We won't allow a
>Only in kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/blkfront: block.h.orig
>diff -ur kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/xenbus/xenbus_probe.c kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/xenbus/xenbus_probe.c
>--- kernel-2.6.20.orig/linux-2.6.20.x86_64/drivers/xen/xenbus/xenbus_probe.c	2007-07-12 13:42:47.000000000 +0100
>+++ kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/xenbus/xenbus_probe.c	2007-07-12 13:44:06.000000000 +0100
>@@ -940,6 +940,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
>@@ -952,7 +953,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)
>Only in kernel-2.6.20/linux-2.6.20.x86_64/drivers/xen/xenbus: xenbus_probe.c.orig
>diff -ur kernel-2.6.20.orig/linux-2.6.20.x86_64/include/xen/xenbus.h kernel-2.6.20/linux-2.6.20.x86_64/include/xen/xenbus.h
>--- kernel-2.6.20.orig/linux-2.6.20.x86_64/include/xen/xenbus.h	2007-07-12 13:43:03.000000000 +0100
>+++ kernel-2.6.20/linux-2.6.20.x86_64/include/xen/xenbus.h	2007-07-12 13:44:06.000000000 +0100
>@@ -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)
>Only in kernel-2.6.20/linux-2.6.20.x86_64/include/xen: xenbus.h.orig

Actions: View | Diff

Attachments on bug 247265: 159140 | 159143