diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-27 17:32:36 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 11:34:49 +0100 |
| commit | c4752ef1284519c3baa1c3b19df34a80b4905245 (patch) | |
| tree | 60585a6a3ad1ff8165e6921f348eb17701b39732 /drivers/block/drbd/drbd_receiver.c | |
| parent | 73a01a18b9c28a0fab1131ece5b0a9bc00a879b8 (diff) | |
| download | kernel_samsung_smdk4412-c4752ef1284519c3baa1c3b19df34a80b4905245.zip kernel_samsung_smdk4412-c4752ef1284519c3baa1c3b19df34a80b4905245.tar.gz kernel_samsung_smdk4412-c4752ef1284519c3baa1c3b19df34a80b4905245.tar.bz2 | |
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 04a08e7..ee9238e 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3279,6 +3279,7 @@ static int receive_sync_uuid(struct drbd_conf *mdev, enum drbd_packets cmd, unsi wait_event(mdev->misc_wait, mdev->state.conn == C_WF_SYNC_UUID || + mdev->state.conn == C_BEHIND || mdev->state.conn < C_CONNECTED || mdev->state.disk < D_NEGOTIATING); @@ -4338,6 +4339,14 @@ static int got_BarrierAck(struct drbd_conf *mdev, struct p_header80 *h) tl_release(mdev, p->barrier, be32_to_cpu(p->set_size)); + if (mdev->state.conn == C_AHEAD && + atomic_read(&mdev->ap_in_flight) == 0 && + list_empty(&mdev->start_resync_work.list)) { + struct drbd_work *w = &mdev->start_resync_work; + w->cb = w_start_resync; + drbd_queue_work_front(&mdev->data.work, w); + } + return TRUE; } |