Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd28d3c authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: factor out drbd_rs_controller_reset 



Preparation patch to be able to use the auto-throttling resync controller
for online-verify requests as well.

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

drivers/block/drbd/drbd_int.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1499,6 +1499,7 @@ extern int drbd_resync_finished(struct drbd_conf *mdev); 
extern int drbd_md_sync_page_io(struct drbd_conf *mdev,

extern int drbd_md_sync_page_io(struct drbd_conf *mdev,

		struct drbd_backing_dev *bdev, sector_t sector, int rw);

		struct drbd_backing_dev *bdev, sector_t sector, int rw);

extern void drbd_ov_oos_found(struct drbd_conf*, sector_t, int);

extern void drbd_ov_oos_found(struct drbd_conf*, sector_t, int);

extern void drbd_rs_controller_reset(struct drbd_conf *mdev);





static inline void ov_oos_print(struct drbd_conf *mdev)

static inline void ov_oos_print(struct drbd_conf *mdev)

{

{

drivers/block/drbd/drbd_worker.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -1439,6 +1439,17 @@ int drbd_alter_sa(struct drbd_conf *mdev, int na) 
	return retcode;

	return retcode;

}

}





void drbd_rs_controller_reset(struct drbd_conf *mdev)

{

	atomic_set(&mdev->rs_sect_in, 0);

	atomic_set(&mdev->rs_sect_ev, 0);

	mdev->rs_in_flight = 0;

	mdev->rs_planed = 0;

	spin_lock(&mdev->peer_seq_lock);

	fifo_set(&mdev->rs_plan_s, 0);

	spin_unlock(&mdev->peer_seq_lock);

}



/**

/**

 * drbd_start_resync() - Start the resync process

 * drbd_start_resync() - Start the resync process

 * @mdev:	DRBD device.

 * @mdev:	DRBD device.
@@ -1556,13 +1567,7 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side) 
			drbd_resync_finished(mdev);

			drbd_resync_finished(mdev);

		}

		}





		atomic_set(&mdev->rs_sect_in, 0);

		drbd_rs_controller_reset(mdev);

		atomic_set(&mdev->rs_sect_ev, 0);

		mdev->rs_in_flight = 0;

		mdev->rs_planed = 0;

		spin_lock(&mdev->peer_seq_lock);

		fifo_set(&mdev->rs_plan_s, 0);

		spin_unlock(&mdev->peer_seq_lock);

		/* ns.conn may already be != mdev->state.conn,

		/* ns.conn may already be != mdev->state.conn,

		 * we may have been paused in between, or become paused until

		 * we may have been paused in between, or become paused until

		 * the timer triggers.

		 * the timer triggers.