]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
workqueue: use mod_delayed_work() instead of cancel + queue
authorTejun Heo <tj@kernel.org>
Fri, 3 Aug 2012 17:30:47 +0000 (10:30 -0700)
committerTejun Heo <tj@kernel.org>
Mon, 13 Aug 2012 23:27:37 +0000 (16:27 -0700)
commit41f63c5359d14ca995172b8f6eaffd93f60fec54
treed3d93dfd25d2e29e8abeae934835f2266b018cb7
parent8376fe22c7e79c7e90857d39f82aeae6cad6c4b8
workqueue: use mod_delayed_work() instead of cancel + queue

Convert delayed_work users doing cancel_delayed_work() followed by
queue_delayed_work() to mod_delayed_work().

Most conversions are straight-forward.  Ones worth mentioning are,

* drivers/edac/edac_mc.c: edac_mc_workq_setup() converted to always
  use mod_delayed_work() and cancel loop in
  edac_mc_reset_delay_period() is dropped.

* drivers/platform/x86/thinkpad_acpi.c: No need to remember whether
  watchdog is active or not.  @fan_watchdog_active and related code
  dropped.

* drivers/power/charger-manager.c: Seemingly a lot of
  delayed_work_pending() abuse going on here.
  [delayed_]work_pending() are unsynchronized and racy when used like
  this.  I converted one instance in fullbatt_handler().  Please
  conver the rest so that it invokes workqueue APIs for the intended
  target state rather than trying to game work item pending state
  transitions.  e.g. if timer should be modified - call
  mod_delayed_work(), canceled - call cancel_delayed_work[_sync]().

* drivers/thermal/thermal_sys.c: thermal_zone_device_set_polling()
  simplified.  Note that round_jiffies() calls in this function are
  meaningless.  round_jiffies() work on absolute jiffies not delta
  delay used by delayed_work.

v2: Tomi pointed out that __cancel_delayed_work() users can't be
    safely converted to mod_delayed_work().  They could be calling it
    from irq context and if that happens while delayed_work_timer_fn()
    is running, it could deadlock.  __cancel_delayed_work() users are
    dropped.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Roland Dreier <roland@kernel.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Len Brown <len.brown@intel.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
18 files changed:
block/genhd.c
drivers/edac/edac_mc.c
drivers/infiniband/core/addr.c
drivers/infiniband/hw/nes/nes_hw.c
drivers/infiniband/hw/nes/nes_nic.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/platform/x86/thinkpad_acpi.c
drivers/power/charger-manager.c
drivers/power/ds2760_battery.c
drivers/power/jz4740-battery.c
drivers/thermal/thermal_sys.c
fs/afs/callback.c
fs/afs/server.c
fs/afs/vlocation.c
fs/nfs/nfs4renewd.c
net/core/dst.c
net/rfkill/input.c