imported patch CA-8806-blk-dont-reconnect-on-unplug

diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c
index 08ff8fc12df027c78a8a2b7fe3d53eb8a22b0f08..30285f493063cc59953c28e312205389eaa5e292 100644 (file)
--- a/drivers/xen/blkback/xenbus.c
+++ b/drivers/xen/blkback/xenbus.c
@@ -525,7 +525,7 @@ static void frontend_changed(struct xenbus_device *dev,
                /* Ensure we connect even when two watches fire in 
                   close successsion and we miss the intermediate value 
                   of frontend_state. */
-               if (dev->state != XenbusStateConnected) {
+               if (dev->state != XenbusStateConnected && dev->state != XenbusStateClosing) {
                        err = connect_ring(be);
                        if (err)
                                break;

diff --git a/drivers/xen/blktap/xenbus.c b/drivers/xen/blktap/xenbus.c
index d945641177c3de901c6fde4e925a1c89c0e18558..11fc8bf7a1f2d6ecad885ce3a32c7c2599c11d8e 100644 (file)
--- a/drivers/xen/blktap/xenbus.c
+++ b/drivers/xen/blktap/xenbus.c
@@ -632,7 +632,7 @@ static void tap_frontend_changed(struct xenbus_device *dev,
                /* Ensure we connect even when two watches fire in 
                   close successsion and we miss the intermediate value 
                   of frontend_state. */
-               if (dev->state != XenbusStateConnected) {
+               if (dev->state != XenbusStateConnected && dev->state != XenbusStateClosing) {
                        err = connect_ring(be);
                        if (err)
                                break;