[PATCH] RDMA: update missed converion of flush_scheduled_work()

From: Tejun Heo
Date: Mon Jan 24 2011 - 06:07:13 EST


Commit f0626710 (d9112f11586830d22501d0e26245ea) introduced ib_wq and
removed the use of flush_scheduled_work(); however, during merge
process one chunk was lost in ib_sa_remove_one(). Fix it.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Roland Dreier <rolandd@xxxxxxxxx>
---
drivers/infiniband/core/sa_query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: work/drivers/infiniband/core/sa_query.c
===================================================================
--- work.orig/drivers/infiniband/core/sa_query.c
+++ work/drivers/infiniband/core/sa_query.c
@@ -1079,7 +1079,7 @@ static void ib_sa_remove_one(struct ib_d

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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/