From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Wed, 2 Dec 2009 12:50:44 +0000 (+0000)
Subject: v2vdev: always call v2vdisconnect, whatever the state.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=def4ae9184c1e05d67bd1304a8521dff1fed57fe;p=xenclient%2Flinux-2.6.27-pq.git

v2vdev: always call v2vdisconnect, whatever the state.
---

diff --git a/master/v2v-dev b/master/v2v-dev
index 21dd14b..d837a10 100644
--- a/master/v2v-dev
+++ b/master/v2v-dev
@@ -26,10 +26,10 @@ index 8e35e62..50201b1 100644
  ccflags-$(CONFIG_XEN_V2V_DEBUG) += -DDEBUG
 diff --git a/drivers/xen/v2v/v2vdev.c b/drivers/xen/v2v/v2vdev.c
 new file mode 100644
-index 0000000..9a42523
+index 0000000..f827221
 --- /dev/null
 +++ b/drivers/xen/v2v/v2vdev.c
-@@ -0,0 +1,909 @@
+@@ -0,0 +1,905 @@
 +/******************************************************************************
 + * drivers/xen/v2v/v2vdev.c
 + *
@@ -852,11 +852,7 @@ index 0000000..9a42523
 +{
 +  struct v2vdev *c = f->private_data;
 +
-+
-+  //FIXME - race
-+  if (c->state == V2VDEV_CONNECTED)
-+    v2v_disconnect (c->channel);
-+
++  v2v_disconnect (c->channel);
 +  if (c->read_buf)
 +    buffer_free (c->read_buf);
 +