RDMA: Update missed conversion of flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Mon, 24 Jan 2011 11:06:54 +0000 (11:06 +0000)
committerRoland Dreier <roland@purestorage.com>
Sat, 29 Jan 2011 00:39:08 +0000 (16:39 -0800)
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>
drivers/infiniband/core/sa_query.c

index e38be1b..fbbfa24 100644 (file)
@@ -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) {