summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_int.h
diff options
context:
space:
mode:
authorKees Cook2017-10-18 05:33:01 +0200
committerKees Cook2017-11-06 21:49:57 +0100
commit2bccef39c0d94b9ee428ae777c59cef1fced786c (patch)
tree83a1cf9ca1d307290c9e7c45cab12b27a22e4ed2 /drivers/block/drbd/drbd_int.h
parentmailbox: Convert timers to use timer_setup() (diff)
downloadkernel-qcow2-linux-2bccef39c0d94b9ee428ae777c59cef1fced786c.tar.gz
kernel-qcow2-linux-2bccef39c0d94b9ee428ae777c59cef1fced786c.tar.xz
kernel-qcow2-linux-2bccef39c0d94b9ee428ae777c59cef1fced786c.zip
drbd: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Philipp Reisner <philipp.reisner@linbit.com> Cc: Lars Ellenberg <lars.ellenberg@linbit.com> Cc: drbd-dev@lists.linbit.com Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
-rw-r--r--drivers/block/drbd/drbd_int.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 7e8589ce631c..06ecee1b528e 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1551,8 +1551,8 @@ extern int w_restart_disk_io(struct drbd_work *, int);
extern int w_send_out_of_sync(struct drbd_work *, int);
extern int w_start_resync(struct drbd_work *, int);
-extern void resync_timer_fn(unsigned long data);
-extern void start_resync_timer_fn(unsigned long data);
+extern void resync_timer_fn(struct timer_list *t);
+extern void start_resync_timer_fn(struct timer_list *t);
extern void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req);