From 65a7bd0f221d7f46797a771b4637ea47cf76e93f Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Thu, 28 May 2009 11:54:19 +0100 Subject: [PATCH] patch CA-8806-blk-dont-reconnect-on-unplug --- drivers/xen/blkback/xenbus.c | 2 +- drivers/xen/blktap/xenbus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c index b4ae35c4..a1ac9001 100644 --- 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 de7a8adf..1291d557 100644 --- 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; -- 2.39.5