diff options
| author | Tejun Heo <tj@kernel.org> | 2011-01-24 11:06:54 +0000 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-01-28 16:39:08 -0800 |
| commit | 96e61fa55e86fbd10c526567aacae5b484c4b63c (patch) | |
| tree | ae95defe8cc2597352baa30e720ccb7ba21bd587 /drivers | |
| parent | a25cecce88194b2edf38b8c3b1665e9318eb2d22 (diff) | |
| download | linux-stable-96e61fa55e86fbd10c526567aacae5b484c4b63c.tar.gz linux-stable-96e61fa55e86fbd10c526567aacae5b484c4b63c.tar.bz2 linux-stable-96e61fa55e86fbd10c526567aacae5b484c4b63c.zip | |
RDMA: Update missed conversion of flush_scheduled_work()
Commit f06267104dd9 ("RDMA: Update workqueue usage") introduced ib_wq
and removed the use of flush_scheduled_work(); however, during the merge
process one chunk was lost in ib_sa_remove_one(). Fix it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/core/sa_query.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index e38be1bcc01c..fbbfa24cf572 100644 --- a/drivers/infiniband/core/sa_query.c +++ b/drivers/infiniband/core/sa_query.c @@ -1079,7 +1079,7 @@ static void ib_sa_remove_one(struct ib_device *device) ib_unregister_event_handler(&sa_dev->event_handler); - flush_scheduled_work(); + flush_workqueue(ib_wq); for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) { if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) { |