diff options
author | Geliang Tang <geliangtang@gmail.com> | 2017-08-29 04:20:40 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-08-29 17:34:45 -0400 |
commit | be7445a38110a4232ea6c8a589ba4cb18aceb41c (patch) | |
tree | 4691c250c98f9b5480bcd52cb6fd90f5c64127de | |
parent | 7c752ed3257517fc8607ab1d19fe4e86155721e3 (diff) |
drbd: Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 11f3852ebea3..056d9ab91c29 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -2023,18 +2023,14 @@ void drbd_init_set_defaults(struct drbd_device *device) | |||
2023 | device->unplug_work.cb = w_send_write_hint; | 2023 | device->unplug_work.cb = w_send_write_hint; |
2024 | device->bm_io_work.w.cb = w_bitmap_io; | 2024 | device->bm_io_work.w.cb = w_bitmap_io; |
2025 | 2025 | ||
2026 | init_timer(&device->resync_timer); | 2026 | setup_timer(&device->resync_timer, resync_timer_fn, |
2027 | init_timer(&device->md_sync_timer); | 2027 | (unsigned long)device); |
2028 | init_timer(&device->start_resync_timer); | 2028 | setup_timer(&device->md_sync_timer, md_sync_timer_fn, |
2029 | init_timer(&device->request_timer); | 2029 | (unsigned long)device); |
2030 | device->resync_timer.function = resync_timer_fn; | 2030 | setup_timer(&device->start_resync_timer, start_resync_timer_fn, |
2031 | device->resync_timer.data = (unsigned long) device; | 2031 | (unsigned long)device); |
2032 | device->md_sync_timer.function = md_sync_timer_fn; | 2032 | setup_timer(&device->request_timer, request_timer_fn, |
2033 | device->md_sync_timer.data = (unsigned long) device; | 2033 | (unsigned long)device); |
2034 | device->start_resync_timer.function = start_resync_timer_fn; | ||
2035 | device->start_resync_timer.data = (unsigned long) device; | ||
2036 | device->request_timer.function = request_timer_fn; | ||
2037 | device->request_timer.data = (unsigned long) device; | ||
2038 | 2034 | ||
2039 | init_waitqueue_head(&device->misc_wait); | 2035 | init_waitqueue_head(&device->misc_wait); |
2040 | init_waitqueue_head(&device->state_wait); | 2036 | init_waitqueue_head(&device->state_wait); |