Staging: hv: storvsc: Fix a bug in the storvsc_remove() function

When the storvs driver unloads, we need to accomodate disk cache flushes.
Re-order the code to permit this.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 33bce87793be6130fc478e3a68f429c945c0af94..fd474d6d3583b363cdf01509d023a5e5c839b958 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -317,22 +317,20 @@ static int storvsc_remove(struct hv_device *dev)
        struct hv_host_device *host_dev =
                        (struct hv_host_device *)host->hostdata;
 
+       DPRINT_INFO(STORVSC, "removing host adapter (%p)...", host);
+       scsi_remove_host(host);
+
+       DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
+       scsi_host_put(host);
        /*
         * Call to the vsc driver to let it know that the device is being
         * removed
         */
        storvsc_dev_remove(dev);
-
        if (host_dev->request_pool) {
                kmem_cache_destroy(host_dev->request_pool);
                host_dev->request_pool = NULL;
        }
-
-       DPRINT_INFO(STORVSC, "removing host adapter (%p)...", host);
-       scsi_remove_host(host);
-
-       DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
-       scsi_host_put(host);
        return 0;
 }