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>
Showing
- block/ll_rw_blk.c 1 addition, 1 deletionblock/ll_rw_blk.c
- drivers/ata/libata-core.c 4 additions, 4 deletionsdrivers/ata/libata-core.c
- drivers/net/e1000/e1000_main.c 1 addition, 1 deletiondrivers/net/e1000/e1000_main.c
- drivers/net/phy/phy.c 2 additions, 2 deletionsdrivers/net/phy/phy.c
- drivers/net/tg3.c 1 addition, 1 deletiondrivers/net/tg3.c
- fs/aio.c 2 additions, 2 deletionsfs/aio.c
- include/linux/workqueue.h 12 additions, 9 deletionsinclude/linux/workqueue.h
- kernel/workqueue.c 17 additions, 19 deletionskernel/workqueue.c
- net/ipv4/ipvs/ip_vs_ctl.c 1 addition, 1 deletionnet/ipv4/ipvs/ip_vs_ctl.c
Loading
Please register or sign in to comment