From: Sagi Grimberg <sagig@mellanox.com>
Date: Mon, 19 May 2014 14:44:25 +0000 (+0300)
Subject: Target/iser: Wait for proper cleanup before unloading
X-Git-Tag: v3.15.3~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d616f6745dbf0b178e8f645a7a0e662ccc4edd0d;p=thirdparty%2Fkernel%2Fstable.git

Target/iser: Wait for proper cleanup before unloading

commit f5ebec9629cf78eeeea4b8258882a9f439ab2404 upstream.

disconnected_handler works are scheduled on system_wq.
When attempting to unload, first make sure all works
have cleaned up.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 2182891a1b774..8a776dae4e528 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -3289,6 +3289,7 @@ destroy_rx_wq:
 
 static void __exit isert_exit(void)
 {
+	flush_scheduled_work();
 	destroy_workqueue(isert_comp_wq);
 	destroy_workqueue(isert_rx_wq);
 	iscsit_unregister_transport(&iser_target_transport);