1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index 522f2daa96cc..474d52ec3374 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -43,7 +43,7 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev)
         pdev->xdev = xdev;
         dev_set_drvdata(&xdev->dev, pdev);
 
-        spin_lock_init(&pdev->dev_lock);
+        mutex_init(&pdev->dev_lock);
 
         pdev->sh_info = NULL;
         pdev->evtchn_irq = INVALID_EVTCHN_IRQ;
@@ -61,14 +61,12 @@ out:
 
 static void xen_pcibk_disconnect(struct xen_pcibk_device *pdev)
 {
-        spin_lock(&pdev->dev_lock);
-
+        mutex_lock(&pdev->dev_lock);
         /* Ensure the guest can't trigger our handler before removing devices */
         if (pdev->evtchn_irq != INVALID_EVTCHN_IRQ) {
                 unbind_from_irqhandler(pdev->evtchn_irq, pdev);
                 pdev->evtchn_irq = INVALID_EVTCHN_IRQ;
         }
-        spin_unlock(&pdev->dev_lock);
 
         /* If the driver domain started an op, make sure we complete it
          * before releasing the shared memory */
@@ -76,13 +74,11 @@ static void xen_pcibk_disconnect(struct xen_pcibk_device *pdev)
         /* Note, the workqueue does not use spinlocks at all.*/
         flush_workqueue(xen_pcibk_wq);
 
-        spin_lock(&pdev->dev_lock);
         if (pdev->sh_info != NULL) {
                 xenbus_unmap_ring_vfree(pdev->xdev, pdev->sh_info);
                 pdev->sh_info = NULL;
         }
-        spin_unlock(&pdev->dev_lock);
-
+        mutex_unlock(&pdev->dev_lock);
 }
 
 static void free_pdev(struct xen_pcibk_device *pdev)
@@ -119,9 +115,7 @@ static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int gnt_ref,
                 goto out;
         }
 
-        spin_lock(&pdev->dev_lock);
         pdev->sh_info = vaddr;
-        spin_unlock(&pdev->dev_lock);
 
         err = bind_interdomain_evtchn_to_irqhandler(
                 pdev->xdev->otherend_id, remote_evtchn, xen_pcibk_handle_event,
@@ -131,10 +125,7 @@ static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int gnt_ref,
                                  "Error binding event channel to IRQ");
                 goto out;
         }
-
-        spin_lock(&pdev->dev_lock);
         pdev->evtchn_irq = err;
-        spin_unlock(&pdev->dev_lock);
         err = 0;
 
         dev_dbg(&pdev->xdev->dev, "Attached!\n");
@@ -149,6 +140,7 @@ static int xen_pcibk_attach(struct xen_pcibk_device *pdev)
         char *magic = NULL;
 
 
+        mutex_lock(&pdev->dev_lock);
         /* Make sure we only do this setup once */
         if (xenbus_read_driver_state(pdev->xdev->nodename) !=
             XenbusStateInitialised)
@@ -193,6 +185,7 @@ static int xen_pcibk_attach(struct xen_pcibk_device *pdev)
 
         dev_dbg(&pdev->xdev->dev, "Connected? %d\n", err);
 out:
+        mutex_unlock(&pdev->dev_lock);
 
         kfree(magic);
 
@@ -368,6 +361,7 @@ static int xen_pcibk_reconfigure(struct xen_pcibk_device *pdev)
 
         dev_dbg(&pdev->xdev->dev, "Reconfiguring device ...\n");
 
+        mutex_lock(&pdev->dev_lock);
         /* Make sure we only reconfigure once */
         if (xenbus_read_driver_state(pdev->xdev->nodename) !=
             XenbusStateReconfiguring)
@@ -505,6 +499,7 @@ static int xen_pcibk_reconfigure(struct xen_pcibk_device *pdev)
         }
 
 out:
+        mutex_unlock(&pdev->dev_lock);
         return 0;
 }
 
@@ -561,6 +556,7 @@ static int xen_pcibk_setup_backend(struct xen_pcibk_device *pdev)
         char dev_str[64];
         char state_str[64];
 
+        mutex_lock(&pdev->dev_lock);
         /* It's possible we could get the call to setup twice, so make sure
          * we're not already connected.
          */
@@ -641,10 +637,10 @@ static int xen_pcibk_setup_backend(struct xen_pcibk_device *pdev)
                                  "Error switching to initialised state!");
 
 out:
+        mutex_unlock(&pdev->dev_lock);
         if (!err)
                 /* see if pcifront is already configured (if not, we'll wait) */
                 xen_pcibk_attach(pdev);
-
         return err;
 }