Commit 1f04af33 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Moved code 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent bc31fe33

drivers/block/drbd/drbd_worker.c

+21 −22
Original line number Diff line number Diff line
@@ -707,28 +707,6 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca 
	return 1;

}





void start_resync_timer_fn(unsigned long data)

{

	struct drbd_conf *mdev = (struct drbd_conf *) data;



	drbd_queue_work(&mdev->tconn->data.work, &mdev->start_resync_work);

}



int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel)

{

	if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) {

		dev_warn(DEV, "w_start_resync later...\n");

		mdev->start_resync_timer.expires = jiffies + HZ/10;

		add_timer(&mdev->start_resync_timer);

		return 1;

	}



	drbd_start_resync(mdev, C_SYNC_SOURCE);

	clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags);

	return 1;

}



int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel)

{

	kfree(w);
@@ -1462,6 +1440,27 @@ void drbd_rs_controller_reset(struct drbd_conf *mdev) 
	spin_unlock(&mdev->peer_seq_lock);

}



void start_resync_timer_fn(unsigned long data)

{

	struct drbd_conf *mdev = (struct drbd_conf *) data;



	drbd_queue_work(&mdev->tconn->data.work, &mdev->start_resync_work);

}



int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel)

{

	if (atomic_read(&mdev->unacked_cnt) || atomic_read(&mdev->rs_pending_cnt)) {

		dev_warn(DEV, "w_start_resync later...\n");

		mdev->start_resync_timer.expires = jiffies + HZ/10;

		add_timer(&mdev->start_resync_timer);

		return 1;

	}



	drbd_start_resync(mdev, C_SYNC_SOURCE);

	clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags);

	return 1;

}



/**

 * drbd_start_resync() - Start the resync process

 * @mdev:	DRBD device.