summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorPhilipp Reisner2010-12-27 11:51:23 +0100
committerPhilipp Reisner2011-03-10 11:45:28 +0100
commit794abb753e29e85949b3719dbc2ab6a98711a47e (patch)
tree95d03c4b184c28087fa3ff1f4f5562a5ee5b0a56 /drivers/block/drbd/drbd_main.c
parentdrbd: Be more careful with SyncSource -> Ahead transitions (diff)
downloadkernel-qcow2-linux-794abb753e29e85949b3719dbc2ab6a98711a47e.tar.gz
kernel-qcow2-linux-794abb753e29e85949b3719dbc2ab6a98711a47e.tar.xz
kernel-qcow2-linux-794abb753e29e85949b3719dbc2ab6a98711a47e.zip
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)
INIT_LIST_HEAD(&mdev->start_resync_work.list);
INIT_LIST_HEAD(&mdev->bm_io_work.w.list);
- mdev->resync_work.cb = w_resync_inactive;
+ mdev->resync_work.cb = w_resync_timer;
mdev->unplug_work.cb = w_send_write_hint;
mdev->go_diskless.cb = w_go_diskless;
mdev->md_sync_work.cb = w_md_sync;