unify flush_work/flush_work_keventd and rename it to cancel_work_sync
authorOleg Nesterov <oleg@tv-sign.ru>
Wed, 9 May 2007 09:34:22 +0000 (02:34 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 9 May 2007 19:30:53 +0000 (12:30 -0700)
commit28e53bddf814485699a4142bc056fd37d4e11dd4
tree5182090c4cc2186eedbda3cb90ed82a2836f6ff6
parent5830c5902138f80b0a097b797200c739466beedd
unify flush_work/flush_work_keventd and rename it to cancel_work_sync

flush_work(wq, work) doesn't need the first parameter, we can use cwq->wq
(this was possible from the very beginnig, I missed this).  So we can unify
flush_work_keventd and flush_work.

Also, rename flush_work() to cancel_work_sync() and fix all callers.
Perhaps this is not the best name, but "flush_work" is really bad.

(akpm: this is why the earlier patches bypassed maintainers)

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Auke Kok <auke-jan.h.kok@intel.com>,
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
block/ll_rw_blk.c
drivers/ata/libata-core.c
drivers/net/e1000/e1000_main.c
drivers/net/phy/phy.c
drivers/net/tg3.c
fs/aio.c
include/linux/workqueue.h
kernel/workqueue.c
net/ipv4/ipvs/ip_vs_ctl.c