diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-27 11:32:36 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:34:49 -0500 |
commit | c4752ef1284519c3baa1c3b19df34a80b4905245 (patch) | |
tree | 60585a6a3ad1ff8165e6921f348eb17701b39732 /drivers/block/drbd/drbd_worker.c | |
parent | 73a01a18b9c28a0fab1131ece5b0a9bc00a879b8 (diff) |
drbd: When proxy's buffer drained off go into regular resync mode
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_worker.c')
-rw-r--r-- | drivers/block/drbd/drbd_worker.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 67499077c48..c9e7cb7c788 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -742,6 +742,14 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca | |||
742 | return 1; | 742 | return 1; |
743 | } | 743 | } |
744 | 744 | ||
745 | |||
746 | int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel) | ||
747 | { | ||
748 | drbd_start_resync(mdev, C_SYNC_SOURCE); | ||
749 | |||
750 | return 1; | ||
751 | } | ||
752 | |||
745 | int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) | 753 | int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) |
746 | { | 754 | { |
747 | kfree(w); | 755 | kfree(w); |
@@ -1472,7 +1480,7 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side) | |||
1472 | union drbd_state ns; | 1480 | union drbd_state ns; |
1473 | int r; | 1481 | int r; |
1474 | 1482 | ||
1475 | if (mdev->state.conn >= C_SYNC_SOURCE) { | 1483 | if (mdev->state.conn >= C_SYNC_SOURCE && mdev->state.conn < C_AHEAD) { |
1476 | dev_err(DEV, "Resync already running!\n"); | 1484 | dev_err(DEV, "Resync already running!\n"); |
1477 | return; | 1485 | return; |
1478 | } | 1486 | } |