aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-12-27 05:51:23 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:45:28 -0500
commit794abb753e29e85949b3719dbc2ab6a98711a47e (patch)
tree95d03c4b184c28087fa3ff1f4f5562a5ee5b0a56 /drivers/block/drbd/drbd_main.c
parentda0a78161d2b2da4819a1f05a38bb1dcbe02d951 (diff)
drbd: Cleaned up the resync timer logic
Besides removed a few lines of code, this moves the inspection of the state from before the queuing process to after the queuing. I.e. more closely to the actual invocation of the work. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 90050ab7adf3..4074d6699307 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2978,7 +2978,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
2978 INIT_LIST_HEAD(&mdev->start_resync_work.list); 2978 INIT_LIST_HEAD(&mdev->start_resync_work.list);
2979 INIT_LIST_HEAD(&mdev->bm_io_work.w.list); 2979 INIT_LIST_HEAD(&mdev->bm_io_work.w.list);
2980 2980
2981 mdev->resync_work.cb = w_resync_inactive; 2981 mdev->resync_work.cb = w_resync_timer;
2982 mdev->unplug_work.cb = w_send_write_hint; 2982 mdev->unplug_work.cb = w_send_write_hint;
2983 mdev->go_diskless.cb = w_go_diskless; 2983 mdev->go_diskless.cb = w_go_diskless;
2984 mdev->md_sync_work.cb = w_md_sync; 2984 mdev->md_sync_work.cb = w_md_sync;